merge of '213c582b00d27a563e968bbcd4a9c276301fc7cc'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 15 Jan 2008 00:41:33 +0000 (00:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 15 Jan 2008 00:41:33 +0000 (00:41 +0000)
commite6fe69cb29fbe5f96d8e9506fe2b580aba5ebcd3
tree6eb936a4f6ba17cec6dd3bc90174777b9e1521c6
parent920e841aa9653c915942db6fb22f4b45fc9d1dd3
parent078a12528f103864e5f8bc02149ff17c802a990a
Merge ... '213c582b00d27a563e968bbcd4a9c276301fc7cc'
     and '25cb2cebe575eb9cbee3dab1ae0fa81368eb3bc6'