merge of '0460728e4ca997f4b4f35b944f412c51046ff418'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jan 2008 12:52:08 +0000 (12:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jan 2008 12:52:08 +0000 (12:52 +0000)
commit3f2de5bdbeca3c9d72d1c7cb238b69690798b42c
treee3b351a72ccfe052117caaa70963bc9a38c6e3ed
parentd66b9c244831981f0bec4d6a9593d807d3807188
parent3f6b63a8f4260bc411e29db3ad20d158269e117f
Merge ... '0460728e4ca997f4b4f35b944f412c51046ff418'
     and '1b0acc215822890043b4d815ac222a6c2e77a15b'