merge of '58bcdff88bb0b8e65ab6272fba2d3c6295d40558'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 19 Mar 2007 14:33:25 +0000 (14:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 19 Mar 2007 14:33:25 +0000 (14:33 +0000)
commit6aafdd3cdfe06a45dd4cf6725eed7b2d6f594011
tree21e3c91d20c93255fadc7646aea27dcd2f833a5c
parent4612ecc93c292f7f4f317d79dcb5fba0e8f54d56
parent7744c71746cc2e2043a9b912400da6e3476cb8f6
Merge ... '58bcdff88bb0b8e65ab6272fba2d3c6295d40558'
     and '86cc8bea1064989f059492e80b1cb64624464b9f'