merge of '3b41e4e73158261f5bf7a4671ebe1acc90e80a9c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 May 2008 14:50:07 +0000 (14:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 May 2008 14:50:07 +0000 (14:50 +0000)
     and '545cc6bcb45999e0577dbcf287bebfa887c83b9b'


Trivial merge