merge of '11f2ba91ae8a56ab5343004cd4803a09a163d17b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 9 Jul 2008 12:12:54 +0000 (12:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 9 Jul 2008 12:12:54 +0000 (12:12 +0000)
commitd087bba6ffa4b731d4a22da2a1f41f2a72d8e89e
tree28a007e6653502537d64020e6a13451bae0764f9
parent24a51ce6d225dff097ede2281fc3a688e63865fc
parent5f527012e3d28f44a1159bd73baffd58de5f6dc1
Merge ... '11f2ba91ae8a56ab5343004cd4803a09a163d17b'
     and '257e20c45c425e7969a0ba57313c01788d7066ef'