merge of '2d0e7ded96559d4c71de1153762dd0879fa16697'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jun 2008 12:11:59 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jun 2008 12:11:59 +0000 (12:11 +0000)
     and '3b0348e0f932d88b5a93caf068cae7af759a6339'


Trivial merge