merge of 'ceb311a2e1a0c02e7e63ba78db2d0de804ad8a8e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 13 Jun 2007 11:16:59 +0000 (11:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 13 Jun 2007 11:16:59 +0000 (11:16 +0000)
     and 'd497ec8dfe10c80ed2e58aa10f7448d60b03f6c9'


Trivial merge