bad declaration
ubuntu-related fixes
Merge branch 'fix-service-declaration' into ubuntu-3.1-real