merge of '519fb232d0f89064395bf96f19e36d9567a2f25c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Apr 2008 12:14:33 +0000 (12:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Apr 2008 12:14:33 +0000 (12:14 +0000)
     and 'a9af97a0d7d40825f32be70ec5fdc7757c965989'


Trivial merge