merge of 050c7f49109b8bf3ea8516bec1745c93a28a1b83
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Dec 2005 09:25:21 +0000 (09:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Dec 2005 09:25:21 +0000 (09:25 +0000)
     and d5cad88ce1e757a9ebbac7f47c3c0e728e5a3482


Trivial merge