merge of '2a42d7d6448a3c4c1658313f80832acfc7533808'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 12:03:08 +0000 (12:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 12:03:08 +0000 (12:03 +0000)
     and '7064c8198606896b1a1fbcdc87f350e61d1ce102'


Trivial merge