merge of '9d982d512a4fe1be6d4da15efa2564ac9b14bb0d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jan 2008 23:03:32 +0000 (23:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jan 2008 23:03:32 +0000 (23:03 +0000)
commit4039f0c65f6b69427d32fff4b2eed3eb90e3baec
tree706f4e026a5c8e0946c1051fd3b23d27511a5cad
parenteb3a771f4dc6adab8b752af93f04ea6d442b63f8
parentd3b631e4aa1de6111936a42ef7d8ffa07575c8d0
Merge ... '9d982d512a4fe1be6d4da15efa2564ac9b14bb0d'
     and 'b5107429ca97b2f516633a57175b0dc5846df507'