merge of 'bc7f1f51525f7d568b5fe34877e1237d8d943cd6'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 17 Oct 2007 14:22:45 +0000 (14:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 17 Oct 2007 14:22:45 +0000 (14:22 +0000)
commitf281d0e3585f237d2162e439008cd7deb38972be
tree203e54f7b1d782e68fb03bbccdaf0eaa3c24f00f
parent72a99a8872c4afe0b53ad760c2c9ca63de9f0e7f
parent1755f3fcbe4ec1aae7fec40afad1cc396cb6ae11
Merge ... 'bc7f1f51525f7d568b5fe34877e1237d8d943cd6'
     and 'be08cf05c894e5e60c1759dc02b5c26b50963906'