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)
commit92d8ea690e564f49520fd3965b48ea7ef07a34de
tree85fcd1efe998269418ff6d980861a24eed68fad9
parent0107cec1246dc6fecc2a855bd64a95d1290b1099
parent216b6ede0706c0b7a560fd81269cd234a6c1bee1
Merge ... '5f6162242333485471131d78f950aabf0b553be9'
     and '9b61539b8e105d428c07a9a551cc2bec487151bf'