merged from david
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 22 May 2012 08:16:10 +0000 (10:16 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 22 May 2012 08:16:10 +0000 (10:16 +0200)
commitfa64f7b255b6fce2949ccd13a01714a595020534
treec36790770a73a4523871ca69c11ffa4e61cadabf
parente27a1f01f90f5eae73f66f25b316ee8859f72105
parent9c30a078c04fe1e86b0aea64cc9cb790e95a7c57
merged from david