merge of '29d752d6760fe8971e4d37f73f5bad5ed1b0abd7'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 19:01:20 +0000 (19:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 19:01:20 +0000 (19:01 +0000)
commit0538f8803f582c37075ae5e5965098f118a502fe
tree472262e5884e0982a96e0e36d5904acb07d24b6d
parentcca8232cceedb002d25514df8db2953e3598a9cf
parent22a6c09b599b06bfea0c485e182844c9077e8536
Merge ... '29d752d6760fe8971e4d37f73f5bad5ed1b0abd7'
     and 'c60a4268168f4df8d07b333ec16af3ae2aed261f'