merge of '2ab43fd44163ef54ceb8ddb42879e7220b856fbc'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 28 Jan 2008 00:30:10 +0000 (00:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 28 Jan 2008 00:30:10 +0000 (00:30 +0000)
commitf13d598fc209b7f5e9142b6694751ae0f4d54627
treea90a533086edc5f649bb9bfe2aca70965c4e2bd1
parent3e3426a943c22b95ca15c1c9b72c47502ecc4e28
parent9c4f7421160e01a6e7ff83c8d4bc815ee974a0dd
Merge ... '2ab43fd44163ef54ceb8ddb42879e7220b856fbc'
     and 'f905ec58f78a3b42003e5e0440d048ead8ece5a3'