merge of '7a4fc7be8df3eb6974944effcdca5a2bee336a9b'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 29 Mar 2008 01:40:56 +0000 (01:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 29 Mar 2008 01:40:56 +0000 (01:40 +0000)
commit7d9e53a4342fb5a025bdaacecbc6457bdba1c6cc
tree4bd498b1ab889cd440a05ad15fea142816a9048a
parentf2247f41086d450c8784b801cc32f9cb1bea86cf
parent36d9259bca1df5c4e7874679e5cb75cf905f0109
Merge ... '7a4fc7be8df3eb6974944effcdca5a2bee336a9b'
     and 'd898916e8774cb2230ab7c226d0806ca2ec81f7f'