merge of '471c60fc447650d2ed0a31e10815380ac513ee4a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 14:02:08 +0000 (14:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 14:02:08 +0000 (14:02 +0000)
commite0a282093003775e8bc2614773e9dc3a9cba4674
tree92bd3dbd402d7fb2b7c7f37b9859d3862bf40d02
parent401dc665fbf97899503cfdaa627bd8cb8e5c91ee
parent0a4f08db9177b19e7ee973c6683bce4e750851c1
Merge ... '471c60fc447650d2ed0a31e10815380ac513ee4a'
     and '61c6959ed326b7433e68378046533cb8fa3b76dd'