merge of '3aac4435ac0a2f0e2c57b7ec43c8447ae0b259ea'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 00:40:36 +0000 (00:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 00:40:36 +0000 (00:40 +0000)
commit5fd643adabdf4eb2e6016241003ac260c0b4e143
tree557af04921d0e25b3ae6beb87d11cd6f940f72db
parent9a077a5f32bdb47017f82644d134663adeab8cc5
parenta26724d94e4499a95343d7d4069dc3c006f85365
Merge ... '3aac4435ac0a2f0e2c57b7ec43c8447ae0b259ea'
     and '452752a8a35efe6e789ae2bdef83478bdb218f00'