merge of '434c9b83795714321c5e83703daa92ea144962c8'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 4 Aug 2008 07:24:51 +0000 (07:24 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 4 Aug 2008 07:24:51 +0000 (07:24 +0000)
commit3175adf4a6b4366d60efe54dbda3377849be6ca8
tree3470eb79692374c374dfe958ebf366fd44ab1c3a
parent18ee86b654168f9725c194793de4879076c14ea1
parent2f3a8dec220aeb3c9dcd2b661cda56bb9abdbf6d
Merge ... '434c9b83795714321c5e83703daa92ea144962c8'
     and 'df379835be88c87afe28ebc4ac3ec609317fc047'