merge of '96d7870254b4856e54bb9917bf206a20c8a2143b'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Dec 2007 18:06:56 +0000 (18:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 4 Dec 2007 18:06:56 +0000 (18:06 +0000)
commit5b273dfd5fd8f6e2863e38d7fd245b10b29a4a3d
tree169dd83ba91d011aa5c504ab329efeec5c86141d
parenta36d4624c3e3fae02c9890029d8b2c16c296e4ef
parent90d3ceec768b1dc13d230d45e463178e6f4d9467
Merge ... '96d7870254b4856e54bb9917bf206a20c8a2143b'
     and 'af1fa1ff21fbbd82c0b12c754f37cc126ee70b06'