merge of '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 18:38:48 +0000 (18:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 18:38:48 +0000 (18:38 +0000)
commitcca8232cceedb002d25514df8db2953e3598a9cf
treeb599406a97298858dd8c9ae11ce78d9268b0139b
parent090b0af980c6f5e66e3127ceb4c41fec869beda6
parent8aa18f979e3ae6014e8303fcd2196e22e8f713df
Merge ... '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'
     and '9a389e1e5a5eaac66e8c921c1d1196c323a5030c'