merge of '5347007e975b912492b32fee6d4299c689309996'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 18 Sep 2008 18:13:27 +0000 (18:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 18 Sep 2008 18:13:27 +0000 (18:13 +0000)
     and '5430f9356289c9c7b4cc647832f9e792c388096c'


Trivial merge