merge of '1e012394e595723b164ab2ffb09c796f3acc427f'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 17 Nov 2007 15:13:09 +0000 (15:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 17 Nov 2007 15:13:09 +0000 (15:13 +0000)
commit305088ed5cac5103ccc3b03087a2dc8cf02debcc
tree8bec42f26aac85ef0063686b226134d6cec2fb14
parentf24aaa70507a2973e9862c1cf26180e339dee163
parent5bfb99281a42b7cfccd4cb25c4c4f7c6fe36b243
Merge ... '1e012394e595723b164ab2ffb09c796f3acc427f'
     and 'c6aac16390922aff6ad90c5bbf729c79ece62df3'