merge of '5b06f0eb5e960e760e2621fc769e25d326372fb6'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Feb 2008 20:07:28 +0000 (20:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Feb 2008 20:07:28 +0000 (20:07 +0000)
commit0d892325e298089764eeb56f6202f545a1187a45
tree95a03c0a02dee0676dce6d03895ca7e6acfaced5
parent0d3f844b104f15d15a7a328800d49e4fabcd0317
parent9b80ead019e6694a3eddf818975dd769fd139668
Merge ... '5b06f0eb5e960e760e2621fc769e25d326372fb6'
     and '8b854b2b358a134500f7b4e1826c4fab2dc417ed'