merge of 'af3f6db370a187f22f801a7ed4bdea1061e52e32'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jul 2007 12:11:56 +0000 (12:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jul 2007 12:11:56 +0000 (12:11 +0000)
commitb83f96f847a2bae76cddb3bea49a8787c9a69e89
tree640818ea1a774e3e85c8213949ab38d809466679
parent3bede78036a8de908532294e594f9a96bf3e2e74
parent12e9dd26696aaa5b1ffbc48b8d8eff9afc2c6102
Merge ... 'af3f6db370a187f22f801a7ed4bdea1061e52e32'
     and 'e1ad326dec67a2aaab1bc01b6d70829706bbd6c0'