merge of '1ad3e9affaa2235122936cd88f0c15b045a4ac3b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 8 Oct 2008 09:10:16 +0000 (09:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 8 Oct 2008 09:10:16 +0000 (09:10 +0000)
commit3b4ddd90122af06bbb260e264694d77647832ae8
treeb085c8fa44c19c85063fd37b15cfbbd6e0ccf7fc
parente27ee9f54b1ad02ad85bd705ec5dfbf5eece3628
parent694a522d4bf8c96eb0dbee16fe789aae7640aadc
Merge ... '1ad3e9affaa2235122936cd88f0c15b045a4ac3b'
     and '9ecdd345fb03610fa596e8cd5e8274e166e80087'