merge of '0b19325615fce6910697ae5a99185b4d99f10436'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:30:58 +0000 (08:30 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:30:58 +0000 (08:30 +0000)
commit61d03805ff40801fa069fda38547aff940fba287
tree3def30aeaca5ec1e3f38d7fca85db9fcf07e8328
parente49bf92a7d859ee09be201a9c53ee67aefe6e719
parent243eaf33f10926c0a9c7c5f3f9f07ee9690b659b
Merge ... '0b19325615fce6910697ae5a99185b4d99f10436'
     and 'cce0978f34bb80458a90186b20dadfd46ccfb0b1'