merge of 'f1c0af35653349c378da9671d2861f1aa08e4ecc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jul 2008 15:37:03 +0000 (15:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jul 2008 15:37:03 +0000 (15:37 +0000)
     and 'f5b5a855a9ceef36d2e91eb4defd3cafafea854d'


Trivial merge