merge of 'a5786ab89a3fad9f406eb5b5c5d8a3dde24be1ba'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Aug 2008 08:41:03 +0000 (08:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Aug 2008 08:41:03 +0000 (08:41 +0000)
commit9d38dad01b8fc3123b5168b2031a839a0a46b948
tree8fc30c9a24948152ce25941994e155713d656748
parent6dfd7b3a5ca6a6611d4b6e2c7a5c518d913b70f8
parent4ab670a34db3a47e18bf277ed76f31f02bc6e846
Merge ... 'a5786ab89a3fad9f406eb5b5c5d8a3dde24be1ba'
     and 'c5f94f2e7a0afd67fafc1a2f867ddf8f10dbc2e9'