merge of '425c38aa299f3015ce439347ec5c8736d76b984b'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 13:41:04 +0000 (13:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 13:41:04 +0000 (13:41 +0000)
commit56f58480bba3cc430a788c9d6c9abd371040f68e
treeea1b41a3360fa0e6fa7396e8730d8d9e9d9729e8
parent54ba0710aec882c5adac8d0de08e36136dc9414e
parentae34dd31f15536b14493dcb91eba0209f3e18bd0
Merge ... '425c38aa299f3015ce439347ec5c8736d76b984b'
     and '4e11ae888ef9a24373e696b3cd581aab1009b46d'