merge of '83199e5f8013253895f505392eddf036d9242fd1'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 24 Aug 2008 16:22:34 +0000 (16:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 24 Aug 2008 16:22:34 +0000 (16:22 +0000)
commit2a3a5812f4a2752fefc847d65d0a1b3ede3f0b4f
tree1dda9bd3851af800b7068aec253b34c84ba1c8be
parent48546b8dbfc9bd50e1c4057b90d5765fbbe86fd4
parent78a23dcea5d5b9b124e66afaffcebef37726769c
Merge ... '83199e5f8013253895f505392eddf036d9242fd1'
     and 'dd12cf1614fbdd04c9791735ee944b266f1c6c74'