merge of '1a9562c7bb5c319cf92b8df367011b69cd07992b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 1 Aug 2007 22:06:57 +0000 (22:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 1 Aug 2007 22:06:57 +0000 (22:06 +0000)
commitb8bf7953ae2944607b965af461a054e563daf966
treefb8db43e6dc266d32c3dc8101960e1e1f194ca82
parent3cca3dfe94dc43f360fe279d6b6f0dafa7581e79
parente881e55b2357af3786cdfaed5003f574f25d0ac1
Merge ... '1a9562c7bb5c319cf92b8df367011b69cd07992b'
     and '2d281351e8579e348717227c6b84f55ef13fd0ff'