merge of '64064cb2195e13dcea4cf2698037a9183688cd68'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 1 Jul 2008 22:12:23 +0000 (22:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 1 Jul 2008 22:12:23 +0000 (22:12 +0000)
     and 'dab6b9ac9cf3985b3daa6239feb3e7f12acdd0f9'


Trivial merge