merge of de44e1f4f8b839dc39ab4dc8631822c41478a41e
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 28 Aug 2005 17:18:36 +0000 (17:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 28 Aug 2005 17:18:36 +0000 (17:18 +0000)
     and e3020c1a18b5e2c1c9b77f0fa7e171112fe9997d


Trivial merge