merge of '184d60b944ea10ce3ad82441a2729777a0ff3122'
authorKoen Kooi <koen@openembedded.org>
Wed, 13 Dec 2006 22:34:09 +0000 (22:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 13 Dec 2006 22:34:09 +0000 (22:34 +0000)
commit1e210c12199d05f2620d58e2f4e9128b04ed8967
tree2b95f3f4ed7de6e564c388a54e274729a4998a0c
parent501bdcb4c3ab3178563bac3f45eed6586f4f7454
parentd4f9315bfae76bf9ce0536363efc674312e2c5c0
Merge ... '184d60b944ea10ce3ad82441a2729777a0ff3122'
     and '8229c859bf92c8ea8a4f24ee106221b9bdccc7e0'