merge of '63238ec5d594052d5284fab3a6fc891dff49f06e'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 12:17:38 +0000 (12:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 12:17:38 +0000 (12:17 +0000)
     and 'e81217cc14efcd0128a1505bf7bb9e4f56021559'


Trivial merge