Bug#641401: Add missing includes to avoid warnings about implicitly converted return values
Usertags: origin-ubuntu oneiric ubuntu-patch
the Ubuntu buildd's rejects upload which causes these warnings. please see the
build log for details.