merge of '2700039073a3760641797b52ac5897f2eee3d92a'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 10:32:12 +0000 (10:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 10:32:12 +0000 (10:32 +0000)
commitccf82499ebfe39b56600044ec78273fd13ba23b0
tree82eb3854c2d16f38651ab3b09b161e4be3ac1764
parent3b770f96f6991d6d43a83f035e6cf98a2d040d92
parent18afb09aa6c08b22f6455dd5f9e2a6a16fe38312
Merge ... '2700039073a3760641797b52ac5897f2eee3d92a'
     and 'ddb3262e0fe9acfe7d20567e33ef27bcfe0d0801'