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)
commit38200716afbfe83af3e513088128d5c0e2e1ba81
treedab5310e01adb588b458672d51d03854504b65fd
parent6349e9965c89c1763faa0c3dee313ccb97e40135
parent203587a387ff77b1fa3a2b62c21403158aa89eed
Merge branch 'gilir-fixes'