merge of 51a0862298fec5cdcacebfb2714635fbeaf4a67a
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 10 Apr 2006 22:06:13 +0000 (22:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Apr 2006 22:06:13 +0000 (22:06 +0000)
     and f9023067ac9702507b8c8e6d17e25a86e9c7eab1


Trivial merge