Commiting some changes from the netbook.
Merge branch 'master' of git://github.com/timofeysie/acknowledge