merge of 9603f6005b15a0057063cac02eda02f14cb2e651
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 4 Sep 2005 23:18:39 +0000 (23:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 23:18:39 +0000 (23:18 +0000)
     and 913ad257363032feeb27b024f8bb727bce13dea7


Trivial merge