merge of '17fe5a20eddea57fb860ffa0652cc78cda424804'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 23:26:41 +0000 (23:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 23:26:41 +0000 (23:26 +0000)
     and '281a5681239793312291488e7b216ecbdfce9b33'


Trivial merge