merge from the mvo branch
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 26 Jan 2010 14:51:45 +0000 (15:51 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 26 Jan 2010 14:51:45 +0000 (15:51 +0100)
commit51f9f4d78deabf54dbbb6881139d2b1a319ffbfc
tree60a2bcd8911acd5c4ab8b4558bfd30344b673ff5
parent76fe5db7153957f8fda437e3bd614312b076f19e
parentc1f168f54be5b4babeb9b91cd7145441ea2489ad
merge from the mvo branch