merge of '1f87c0f3663976dafd6caaabc1cf1397f48451e8'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 21 Jul 2008 14:08:40 +0000 (14:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 21 Jul 2008 14:08:40 +0000 (14:08 +0000)
commit889e7461375f2cb6f4429ad2ddd59122c0b0efc0
tree51ee51c9d22ecbcf0989d6a2d46194d3e3131cc4
parentb6dcbb6854484bc16afcfbf6ef0f6d94753332ad
parentb56be2db834164a767740da4b63ee35c42164086
Merge ... '1f87c0f3663976dafd6caaabc1cf1397f48451e8'
     and 'ef5c7f64094e35acf78793dc2ff1cbcc408d2530'