explicit merge of '8c79c14e519c2da015b828d88899e0af791e9da9'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 19:49:17 +0000 (19:49 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 18 May 2008 19:49:17 +0000 (19:49 +0000)
commit81ab9b94748aa8eee7c9511206c9d95d6f986719
treed2d8ed4ed4a248ac524ac715e4cc2b770bf74b22
parentd00bf954b34e300bea661af0f7d6b18a4043c6ec
parent9fe0c139e1c937056b026e592083392fd7fa1944
explicit merge of '8c79c14e519c2da015b828d88899e0af791e9da9'
              and '94a69c171834b89089886081d5bd9f0e42d880f0'