merge of '53cc62f49c8608e5ffa07ac066958e28d5113f8e'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 11:13:36 +0000 (11:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 11:13:36 +0000 (11:13 +0000)
     and '61fa8bae987fbc94312beed01805ad1e118a1638'


Trivial merge