merge of '425c65549a13b612465a7a2f4e273d993f692a31'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Mar 2008 15:27:06 +0000 (15:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 4 Mar 2008 15:27:06 +0000 (15:27 +0000)
commit9757d602dd4c36a39a236b79c594aa07583ce376
tree12e9d514c919db91870984f9842144bf01933f27
parent0426a9ec2bee047c56ad0eb426547320c552d7b4
parent154b868e5c3c9355fe8e75e06451da192f70163e
Merge ... '425c65549a13b612465a7a2f4e273d993f692a31'
     and '5c59665d0dd415bc5372cdf976b15c13956e6f36'