merge of 'ac5ffabbaf308649443ca65debd0f8c16b815675'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 19 Dec 2007 13:56:13 +0000 (13:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 19 Dec 2007 13:56:13 +0000 (13:56 +0000)
commit8673ba44db298d613cf3a1a1cabb403055857aef
treea31232a2aec9333ed5fe4816dba0a3ba18633db2
parent4629f3ea18791caef39f461325691a85d2d73281
parent63a3fd32777059117fce50479630d531e74c99f6
Merge ... 'ac5ffabbaf308649443ca65debd0f8c16b815675'
     and 'e5050c0a7e566f2f94affbc8a819e4f627eb0ae3'