merged from David
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 22 May 2012 11:29:25 +0000 (13:29 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 22 May 2012 11:29:25 +0000 (13:29 +0200)
commit1351329e376a8dbe7780693693d0f3db0ec749fa
treee1e97354f738b95de1d64922b9f87523de946477
parentfa64f7b255b6fce2949ccd13a01714a595020534
parentf436721681421348c83850fbff502eda3a906379
merged from David