merge of aa755a637d4d88b529d18e8a8944d3db40a48daa
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 14 Aug 2005 22:50:13 +0000 (22:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 22:50:13 +0000 (22:50 +0000)
     and e6e39921b062d03c77147b22e3d7394bdb39a97d


Trivial merge