merge of 1d6a3d6d68a9abcf5e56857fce862ae395db1114
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 24 Aug 2005 09:47:50 +0000 (09:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 09:47:50 +0000 (09:47 +0000)
     and 4ee9f0fdf71120b87f9350480b3a298caed57789


Trivial merge