merge of '5190e4eb0827b8bfe3f72475ad62fd98585e8bfa'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 12:23:06 +0000 (12:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 12:23:06 +0000 (12:23 +0000)
commit32a0895591cb085f7e71b7d83b9f73782d20cc3d
tree123b2382dc74921d5f460f3e338880319c6969d5
parent3e776408674d2fe1ed4ee93ec275a826c66a664b
parentb56edbc0dc68e96887b5042e497af87244d9b6d1
Merge ... '5190e4eb0827b8bfe3f72475ad62fd98585e8bfa'
     and 'e30e879439bfeb0f5e33edf2a3e8bfa1828eed4f'