merge of '719de3c75109455b02f16d45f275877124af83ac'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 05:05:38 +0000 (05:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 05:05:38 +0000 (05:05 +0000)
commit0e8eedf8e6324d9b283a2b6299932d9db18e56ca
tree0a1c792b15044f0ac5c1da7d25b5237537df3c41
parentb1ecf0f6f4d025ba8c41d505acea0d677882e957
parentf095b4bee25564ffde336ab4b5b74e1222766587
Merge ... '719de3c75109455b02f16d45f275877124af83ac'
     and 'acf7a68b5073d3f7ac4300d238187222e6f4c702'