merge of '72cc9aa13fd4a4fd274deff49056beb2f6eb0784'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jun 2007 09:53:32 +0000 (09:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jun 2007 09:53:32 +0000 (09:53 +0000)
     and '8b7536d16e1b51ee2b13d1603f919531a1c9d949'


Trivial merge