merge of 'a215524bc68709c948773354aab3283121aed094'
authorKoen Kooi <koen@openembedded.org>
Mon, 7 Aug 2006 18:44:53 +0000 (18:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 7 Aug 2006 18:44:53 +0000 (18:44 +0000)
commitb4a3c084935bafbbdb3e5093c4584e17410f7b52
tree2f984e26a63d4cf618578f7420a22a1a2bc89665
parent52985b3507d05b5d6be3401c257d94bc0e7cefa5
parente3d48526766de572feae20bb7153588641e188e7
Merge ... 'a215524bc68709c948773354aab3283121aed094'
     and 'bae05c897881f1de9bc358bed7a16439c27e7e5d'