merge of '5f6162242333485471131d78f950aabf0b553be9'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 2 Apr 2007 14:46:27 +0000 (14:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 2 Apr 2007 14:46:27 +0000 (14:46 +0000)
     and '9b61539b8e105d428c07a9a551cc2bec487151bf'


Trivial merge