merge of '4c4e69889620b924d4a3277e83211f6f7f066c8c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 09:49:03 +0000 (09:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 09:49:03 +0000 (09:49 +0000)
     and '7fd15622321922163aab9fa955236c9a25de2e65'


Trivial merge