merge of 28471e009245da0442ed17f5639804a5adbdac68
authorRod Whitby <rod@whitby.id.au>
Tue, 12 Jul 2005 06:47:10 +0000 (06:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Jul 2005 06:47:10 +0000 (06:47 +0000)
     and fd1646cfe6823178da18e7ab08e4757531632257


Trivial merge