merge of '57b770a7023dbcdb2b9d6d1a19890a743793d79c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 09:08:01 +0000 (09:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jun 2008 09:08:01 +0000 (09:08 +0000)
     and 'a6a18f676265371134e8944deb4be3fa0724a352'


Trivial merge