merge of '8c1998b111c4a146ffd919f37f11ce915dbfb6a2'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 13:18:15 +0000 (13:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jun 2008 13:18:15 +0000 (13:18 +0000)
commit6ca732b87c55135550201ed111c576f49e77c4c9
tree9f510d6c6dc0391d824749fd30b8e72abd61b7b3
parent0dea1f494a0104b2404d138d6545bbf1faaabf42
parent7cbb875d8ec9fc0b0d1f9065ddedac4f289b1829
Merge ... '8c1998b111c4a146ffd919f37f11ce915dbfb6a2'
     and 'cfd22580a0b87e00837798107baafb4dc9f27b68'