merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 16 Jan 2008 14:35:33 +0000 (14:35 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 16 Jan 2008 14:35:33 +0000 (14:35 +0000)
commit1583a7507c224ddefca4c5b2118be14288eb839f
treef4bf057570aa3e02a0c428f1d77b733a5225e346
parent3cb1f292aa4ddce72f970ef4181ee7057cf3b573
parent8378be7a49b8cdb9935fdeb2594ddd00d89930e1
Merge ... '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
     and '843d33548c0e77469b4859dd4e3b8c77590cb762'