merge of 3471c6c76e9ecdb72b8fe3522dea2328fb752b16
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 30 Jul 2005 14:21:07 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 14:21:07 +0000 (14:21 +0000)
     and 6c5534d04dfd45ed1c2843d2fb5cc9820b345d50


Trivial merge