merge of '4fe1dea49ed06e807afde9b963aafccb124edd4d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jul 2008 19:00:54 +0000 (19:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jul 2008 19:00:54 +0000 (19:00 +0000)
     and 'aaffbdee48dde7a080e15c0f4d608f013c10a6ae'


Trivial merge