merge of '7a2606dc2c8a5d9ec61bddbad5d013a4bb7bd62a'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Nov 2007 12:17:02 +0000 (12:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Nov 2007 12:17:02 +0000 (12:17 +0000)
commit999b30c11ad6a81c62ef4bfca1169bce9f30fcb5
treebbe7bffa656aa95ee06457cc44cff92877388e3b
parent5a92792e177d62625653ef7d00ed6865b02350ef
parent5bace38faf67d6a960a5a1e5ec71f7d39cb7338f
Merge ... '7a2606dc2c8a5d9ec61bddbad5d013a4bb7bd62a'
     and 'babd660769343b37baf49a84b9c42caf9209315c'