merge of 'e6100a99008ef2edc3a6a765cfa14a1dad489cfb'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 15:32:17 +0000 (15:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 15:32:17 +0000 (15:32 +0000)
     and 'fd6c3104412672124350e987af3ff8736304f817'


Trivial merge