merge of 'af022eaccf1ea1052c096be4c37accec350e9b27'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 12:52:26 +0000 (12:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 12:52:26 +0000 (12:52 +0000)
commit7c9f18e5c7df1f7bd52ebbe6bd7a308ec679495f
tree23abbaf07c52e6d6bd3d489133748a9c4ca2659a
parent0a77cd9448bc221c366fc4a2cf0a93addb50e21d
parent4eaa407b5628e76a45949b86849816f7ee2294f9
Merge ... 'af022eaccf1ea1052c096be4c37accec350e9b27'
     and 'ec665a2227c0b81f567aec855a2e84ae2eb437a8'