merge of 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Apr 2008 12:59:08 +0000 (12:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Apr 2008 12:59:08 +0000 (12:59 +0000)
commit164d14ccf62269636e0179140f24e551b04f9ca0
tree6901edd22f53c7b2d33cfebb4a761b5b71b804fa
parent1c27dfaed0066c9d710be48c34bd0885b32bceaf
parent6d0ef5690afbcb6a9ed3a9b65a059a8fd7828688
Merge ... 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'
     and 'ff99add05b70c6e96f011a1a27dd980a5380a7bf'