merge of '03e37205ddb308324f3e7b1e882c50510b125716'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 1 Aug 2008 18:48:27 +0000 (18:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 1 Aug 2008 18:48:27 +0000 (18:48 +0000)
commit81109d7d1da88e2ceab774868eedfb6d884a8b18
treed19957dcd663f8ddb8e8dc323d9b5d718adb509e
parent5978dd6185ced3c9140640792ada10e9e9251419
parentf07286e9a9effd66435f9541a526348ef5605db0
Merge ... '03e37205ddb308324f3e7b1e882c50510b125716'
     and '9ed8a9e4b331c4c26542be80abb9775edaf8f5bf'