merge of 391914d150c7b77d69474f4e85a3e0cbba8f5388
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Aug 2005 00:40:01 +0000 (00:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 00:40:01 +0000 (00:40 +0000)
     and f4ec4ad70b55a146c0fe36c3cd2324d495e5e681


Trivial merge