merge of '0c9b3ba257c6fd0be25cd50f333f964013afe663'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 6 Feb 2008 22:37:44 +0000 (22:37 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 6 Feb 2008 22:37:44 +0000 (22:37 +0000)
     and '1b09c4fe8e1d1811f3dcd78988db7c3b3e182954'


Trivial merge