merge of '5ad99f74f7f6900d8889b6026325fc81dd39c9ff'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 01:03:35 +0000 (01:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 01:03:35 +0000 (01:03 +0000)
     and 'dbd68acb5b5a6b7f90a7e82b19706ec980e6356f'


Trivial merge