merge of 7674b5cefa1bffe23d1d22a95d2a3e5632799f08
authorRod Whitby <rod@whitby.id.au>
Sun, 24 Jul 2005 09:23:28 +0000 (09:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 09:23:28 +0000 (09:23 +0000)
     and 7f183da4475115f7bfd62b35a7c733fe4fd59258


Trivial merge