merge of '3d05aaf0d53086b42c0aeaa306814e38a106fa9a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 12:07:38 +0000 (12:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 12:07:38 +0000 (12:07 +0000)
     and '457fd6fde63edf614faf98c2e44cbb46c7703a88'


Trivial merge