merge of '5205c4bbe6c22164549099dae6ac17f506611c18'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 16:02:12 +0000 (16:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 16:02:12 +0000 (16:02 +0000)
     and '53a39bdeb01bc91193b8a56e10450806ba2f759a'


Trivial merge