merge of '2189b3da22533b6434462b5c6979a74557c37494'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 30 Sep 2008 15:19:01 +0000 (15:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 30 Sep 2008 15:19:01 +0000 (15:19 +0000)
commitc11a34286b4d919abbd36bec6164718bf126b22c
tree6eb2fcd7c733f72221ac8a87530dcad8faf64bd2
parentb1ac6f2c8b622b77ffb3af413ee4a76e08542364
parent6807c0e4bf6733cb8ae03e0a681457ada33a4ff9
Merge ... '2189b3da22533b6434462b5c6979a74557c37494'
     and 'd03a9a17ed9edfe3cfe1ae0cf6e589d38d28e23f'