merge of 'b99a6dc2eb39390c552fe0329acbb5ed94fa5fcf'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 1 Aug 2008 01:34:51 +0000 (01:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 1 Aug 2008 01:34:51 +0000 (01:34 +0000)
commitd86dadb72d00af99206f5a4f9dd90236eefecd53
treed6305dba3a39b9ff9b06487922fc5ee0a25a5e27
parent923282dc0cd12ba539c648535c12d96f3476c2a9
parent18cf29f67fe256e6ad64a3dbbc114b4a127b6656
Merge ... 'b99a6dc2eb39390c552fe0329acbb5ed94fa5fcf'
     and 'ef63b228877ae1c3c905d3921b256693b1914dea'