merge of 3d6e44c78353ac8e4806b7a4d5b0cc3e8cc80be1
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 14 Aug 2005 09:09:47 +0000 (09:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 09:09:47 +0000 (09:09 +0000)
     and 70d32a50f2a94ca8fcd33396bcedb441034b9e20


Trivial merge