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)
     and '8229c859bf92c8ea8a4f24ee106221b9bdccc7e0'


Trivial merge