merge of '3d02f890a5870026e323b8fbf644e2138a51e3a3'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 13:16:42 +0000 (13:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 13:16:42 +0000 (13:16 +0000)
commit944a05fb7320ce45e14e6af46904c3ab08ea0dca
tree1cae6eba29f77f846839e902ef97964e81100f26
parenta89657079e5ec8b4238fae6b4c3b45919ca5c377
parent71123add8a01a25ebc7fb46bb1e252ae3ffec885
Merge ... '3d02f890a5870026e323b8fbf644e2138a51e3a3'
     and '6f58aae892a3a9e0e720d96f036281d5c255a9a4'