merge of 'd64ac77a872f13513c87a0d8a234d5025cd4b8ab'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 29 Mar 2008 16:34:58 +0000 (16:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 29 Mar 2008 16:34:58 +0000 (16:34 +0000)
commitd706e2e4274bd37ea95c331fbe1b9a9b275bd3b0
tree35722b47d43b40bbc67c689f5a075197168aaf5c
parent73707d39bf38ec027d3351beb7592e104746334d
parent31a0babd0dd6cd19b2e5db1385e261940984e767
Merge ... 'd64ac77a872f13513c87a0d8a234d5025cd4b8ab'
     and 'f818d337a5b7485dbab518f9a6b6d283edcc4f6b'