merge of 47b2cb70582f02182c20ba10e58134187a72bcd3
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 13 Jan 2006 01:06:31 +0000 (01:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 01:06:31 +0000 (01:06 +0000)
     and f1adf0c8840c57a416d7da7085aa694f11be4c5c


Trivial merge