merge of '487bc5fe6a8bd87d425c042e0b0fc4ec73b896f0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Dec 2007 19:19:16 +0000 (19:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Dec 2007 19:19:16 +0000 (19:19 +0000)
     and 'dc35a57a0557f8aeedf0dd350b2b5d7a4c1fd3c6'


Trivial merge