merge of '4e3569a19b8a6f85c3878f45db976a5ef67711f2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jun 2008 15:43:44 +0000 (15:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jun 2008 15:43:44 +0000 (15:43 +0000)
     and 'b6c9567e6cd15dcc0358bab7cdc8c5d45cc4d0c4'


Trivial merge