merge of 03133e2efc4b4ffe3f1544aca8171a7da90221f9
authorRod Whitby <rod@whitby.id.au>
Sat, 9 Jul 2005 07:50:17 +0000 (07:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 9 Jul 2005 07:50:17 +0000 (07:50 +0000)
     and 7c7ad63dfa7e9cf84ed42393167d84da1f7c2030


Trivial merge