merge of 'adb71bd42c308e5f50a18441883b2051173f9cd2'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 06:59:15 +0000 (06:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 06:59:15 +0000 (06:59 +0000)
     and 'd9f9c0225f99c1f7688e60a3a0c39a308c5fc36f'


Trivial merge