merge of '027a24a67d7f612e0e7b0f9f748d81e6a8e018ba'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Apr 2008 12:06:08 +0000 (12:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Apr 2008 12:06:08 +0000 (12:06 +0000)
commitb4804b9510c47cac341a3577efe297db3dc65df6
treebed0cf24af87155a51ce401b5a118c0d4da892c1
parentcf0d990594e373ab4629da67001d92cecb3f9eec
parent5dbf5cafb571280af42d1c0ada7db4b71235b3af
Merge ... '027a24a67d7f612e0e7b0f9f748d81e6a8e018ba'
     and '2129627862caba2989adc92ac7743bda23d46fe0'