merge of '1a4ff139ec1bb8904ee0af6c1cc4b5737a4233cb'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 6 Dec 2007 17:07:57 +0000 (17:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 6 Dec 2007 17:07:57 +0000 (17:07 +0000)
     and 'd025a5f00ad6ca971cacb9b19194efab7e1bee77'


Trivial merge