merge of '3720558b0d1400bac165546368a13f5ef5824873'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 4 Oct 2008 06:34:03 +0000 (06:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 4 Oct 2008 06:34:03 +0000 (06:34 +0000)
commit6bb57185f698795a487cb8f09c29041adb88a7a4
treeaaa0dc92efd81f485b2f529a6f5086063377db76
parentb17768b315fe89e606df75a0da2cb228c50dd399
parent24483588faaf027c968ddde444a87853a5f5de23
Merge ... '3720558b0d1400bac165546368a13f5ef5824873'
     and 'fd803d898183d6c18157193aaa79a715b846876d'