merge of '1cf701ebedabbcfca1fb1b88f2077258b1dfd000'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 22:36:31 +0000 (22:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Sep 2008 22:36:31 +0000 (22:36 +0000)
     and 'f8b059d4fa30751c4f6fddabedcf7b022798effe'


Trivial merge