merge of '0088316df3061919a20637a41044dc15844fd050'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 1 Mar 2008 16:57:44 +0000 (16:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 1 Mar 2008 16:57:44 +0000 (16:57 +0000)
commit6d59cd3d9cf2f752c8afec4e11a282086ffa8395
treeb874a545ce94f7f29052671958f5079e7edfd835
parent942821cc2d7e565e098aa6af4f2529229e9c319b
parent4feb6b6a6332b972493e0dbfe60b8cce64d247cc
Merge ... '0088316df3061919a20637a41044dc15844fd050'
     and 'da5e0ed70f6c251be956cc03725872ed4094d823'