merge of '3ca13f192fc91b43bec662e6b0faf653dd6821b0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 2 Jun 2007 18:21:30 +0000 (18:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 2 Jun 2007 18:21:30 +0000 (18:21 +0000)
     and '96a6065c1531d9a86a1395316c6aa84f4cdf97fd'


Trivial merge