merge of '3dfeb44907c81f6def296b241d716d7c3644f45c'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 18 May 2008 21:48:44 +0000 (21:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 18 May 2008 21:48:44 +0000 (21:48 +0000)
commiteb30f93add7705ed5185b662a3ef8cfcdc904156
treea3b8326de98134ef7e05c82cc0b183b84554a1e1
parentf941d53a64f990702b56e5ef93b2d5e76a9bb944
parent4ae39799c36cb3d1799679e41239b910b6d6834f
Merge ... '3dfeb44907c81f6def296b241d716d7c3644f45c'
     and 'e5c1d0fc9d0187f657d627201c20a38d07617e1f'