merge of '129fcb069108afba06df7a75bcabd8a4ca81c06b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 00:58:18 +0000 (00:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Feb 2008 00:58:18 +0000 (00:58 +0000)
     and '7e91a33e25e4db6e39c13e5d76825e86b64370e0'


Trivial merge