merge of 'e6967a90020b84553487e008644039b8e0fad143'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 19:25:30 +0000 (19:25 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 19:25:30 +0000 (19:25 +0000)
commitd0f13d4f833060171b6a677ea0c41e8a870ed4de
tree4f8e6935c127812f0d5faa4ea6c11ae3535e05fe
parent12d235bb4d804f365464087c118b52e8c7e20709
parent3ea488871cc35001503eeb2694859a5e40fbb2c1
Merge ... 'e6967a90020b84553487e008644039b8e0fad143'
     and 'f98e1fc33b6d30e6e946f29f43f26ffaa1b5fcad'