Merge branch 'gilir-fixes'
authorJulien Lavergne <gilir@ubuntu.com>
Mon, 9 May 2011 15:25:16 +0000 (17:25 +0200)
committerJulien Lavergne <gilir@ubuntu.com>
Mon, 9 May 2011 15:25:16 +0000 (17:25 +0200)

Trivial merge