merge of 0a6a434569e334132e34bc3e542f512c7505ba89
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 17 Sep 2005 18:17:24 +0000 (18:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Sep 2005 18:17:24 +0000 (18:17 +0000)
     and 912340c2ffb2a6e611a7a4144472515e1110d583


Trivial merge