merge of '26f1976aebe86c41d96f819481534c07971f4cfe'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 09:19:37 +0000 (09:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Jul 2008 09:19:37 +0000 (09:19 +0000)
     and '46607c54b809e03372f1d5b8cdebbf77f4ffcd02'


Trivial merge