merge of '36f8a0f11c2d91f3ff09cf8bedb378068edf2eeb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:40:51 +0000 (16:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:40:51 +0000 (16:40 +0000)
     and '78e039dbf96b6ba715ad0f1fd86c1e99dc12aed3'


Trivial merge