merge of '503b3ade200ad628a4b30fab228c365b8c0cf2ea'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 10 Jan 2008 23:11:30 +0000 (23:11 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 10 Jan 2008 23:11:30 +0000 (23:11 +0000)
commitf4f969a659645ac0ad184f1959f9213e0ae8be53
tree2c870292829a5c1f3e77e9bb0f256b74295456db
parente83cd15cbbe73ab0dd97f3e07056d6e0fc03be59
parent7e8411a730dbfa42b70ac583e14f64bd0465f2a3
Merge ... '503b3ade200ad628a4b30fab228c365b8c0cf2ea'
     and '9910934c4f018cde20787ccaa558640752542098'