merge of 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Apr 2008 12:59:08 +0000 (12:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Apr 2008 12:59:08 +0000 (12:59 +0000)
     and 'ff99add05b70c6e96f011a1a27dd980a5380a7bf'


Trivial merge