merge of '031c775259e9fb4ce551180e6afdddbbefed9028'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 26 Aug 2007 17:02:55 +0000 (17:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 26 Aug 2007 17:02:55 +0000 (17:02 +0000)
commitb7b0c24262d094125b620648880e56aef404875a
tree0b2d9da502451ec139b354653060bb482c0462bc
parent45098c242ea0c4b1148d55d3d086ad605fcffe94
parent779b1325edabf86b40abeb1e26f3704f0cdeea5a
Merge ... '031c775259e9fb4ce551180e6afdddbbefed9028'
     and '5780868a45dc58cf874f02cfc160c62adf208632'