merge of '3cbc7c235df8720637ca4f1cfe3886d015edcd18'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Apr 2008 10:34:06 +0000 (10:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Apr 2008 10:34:06 +0000 (10:34 +0000)
commit408ac901f3fbc62684c7d9d2cd2e15b5688e6194
tree50ef5aabdcdf80af4eacd8a252b20bd8aab20c51
parent013231b4a6d1eebf7c031f1624089728e13dfb73
parent70ca9b3ba7dcafaca2a0d8bc63dbad32ad7da929
Merge ... '3cbc7c235df8720637ca4f1cfe3886d015edcd18'
     and '414c46b290373923c8fbd2f140667276dc33aa54'