merge of '168c993c49f268b8a0f366d8ffd63a961512f7fe'
authorKoen Kooi <koen@openembedded.org>
Sat, 22 Sep 2007 07:26:49 +0000 (07:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 22 Sep 2007 07:26:49 +0000 (07:26 +0000)
commite9b0058cc25ea97d548a6359d5316740f2c5411c
tree0e6a652071cada3411be4337d6a872a6e5f0748e
parentd2cd3da7119b6e2b11aeec4d97867599dab9af3d
parent33e017d975d8bf6cf3b4b392d0dd0b0e8f25af0b
Merge ... '168c993c49f268b8a0f366d8ffd63a961512f7fe'
     and 'ed2f6968f3a6025abbe5062431c947ea2d34b5aa'