merge of 'a5ebc4455c08465bb3119b12db3f0a95ef0ee51a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 8 Nov 2007 15:52:40 +0000 (15:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 8 Nov 2007 15:52:40 +0000 (15:52 +0000)
commit5479f1bbff9a1fde20e40c5ef8530262f0680309
tree1ef3d147a3099c99db75cfc0c976048ab0b9ea47
parentc89abfa090fbe718350651c2c80b8219fb05f0ea
parent129670673e60da28524d23c451b5d027ccfe84a9
Merge ... 'a5ebc4455c08465bb3119b12db3f0a95ef0ee51a'
     and 'abd46ad11dd10c36a511a2d3d6867a6fb20076ca'