merge of '6104c95bf5e75fc92d17f6e04a7c37a6efbb147f'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 14 Jan 2008 14:06:24 +0000 (14:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 14 Jan 2008 14:06:24 +0000 (14:06 +0000)
commitef9bb6be18022cc530a4a11200c0221ebe69f4e2
tree2c075de79dc567bce36ba1aece39e700d5163eea
parent353324b0aecdf5aa178ece1bc5549c791350cefe
parentd3a4f7da3ca9d8194c9e10e5e858bbba52d8e704
Merge ... '6104c95bf5e75fc92d17f6e04a7c37a6efbb147f'
     and 'f7a565e7e910cea46808ec61590556a6b97dff74'