merge of '1e9547d3fd33d249bb3cdd7e7a4670cfcbb11310'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 23 Jan 2008 21:47:24 +0000 (21:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 23 Jan 2008 21:47:24 +0000 (21:47 +0000)
commit930f0280fede11fef8914288dd6a0e5e5d87ddd8
tree4ddb46990fbf25ccca4bfa26ed72cd7bf9c14d0f
parent89230c2835a3b2d8956ae583cc15336ad3db9b2a
parent6b23e923fddee891ca94cb9dee5c74346bdafda4
Merge ... '1e9547d3fd33d249bb3cdd7e7a4670cfcbb11310'
     and 'f4e5cfc232e8f1488452378938ddaa3b3fc3d4a6'