merge of '425c38aa299f3015ce439347ec5c8736d76b984b'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 13:41:04 +0000 (13:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 13:41:04 +0000 (13:41 +0000)
     and '4e11ae888ef9a24373e696b3cd581aab1009b46d'


Trivial merge