merge of '470ca3fe64c9411d3a7d992db39d5efbed869839'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 17 Jul 2008 18:07:12 +0000 (18:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 17 Jul 2008 18:07:12 +0000 (18:07 +0000)
     and '912f388483a3e1703ca89d7b2309723fd3407420'


Trivial merge