merge of '12b22f976a76556942fa1ed3a18167d5e59a261c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Mar 2007 10:09:10 +0000 (10:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Mar 2007 10:09:10 +0000 (10:09 +0000)
     and '890201ff9b740ceb2b02680d2dede9da64858c14'


Trivial merge