merge of 356722c1e96526d5963e6080fa85700fc49633d9
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 24 Jul 2005 17:56:54 +0000 (17:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 17:56:54 +0000 (17:56 +0000)
     and 7207f6f24d4228e24dd9213ba0ef3aeaf2f5fd83


Trivial merge