merge of '6ce5f26b9e3717a906b07e8edd9eb1f3d7867889'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 22 Jul 2007 17:30:36 +0000 (17:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 22 Jul 2007 17:30:36 +0000 (17:30 +0000)
commit239d0c1d3e83d4bc7b6081471a08c9bd2a16363c
tree42caddd62c55cd05928f2f144460b221208d9222
parent1eb9a4277527f4aeb58126ad9d53374ad904c773
parent671ddaea3f5f4523ab8f7bdd2db19028d52bc1b3
Merge ... '6ce5f26b9e3717a906b07e8edd9eb1f3d7867889'
     and '86395f96ab01c06ac1b4a1f09708e75bf07b969f'