merge of '0ee4237d44d0abae9c6a87517d5a56c8a8fb110e'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 1 Jul 2008 17:47:38 +0000 (17:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 1 Jul 2008 17:47:38 +0000 (17:47 +0000)
commit9a2c4f1b9727b3858e9550c243c67782ab6b2781
tree0ba690ee2643e4bfc1d7ed427e808b329c5dd595
parentd52250fe759756daee3347bf43a54d6d4918fad9
parentefc869189d60a57c942e267502e4ab3918003f8c
Merge ... '0ee4237d44d0abae9c6a87517d5a56c8a8fb110e'
     and '410cd788a5109a93ca33f19e5fd6f567a6e8adef'