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)
commitdd802fd2aa4238db6f39b760930660118f996392
tree60c56d6f047003674efdbfb27679060862c0607f
parentc53c5bb8f78707f1b2b3ef89121e3925cf356222
parent54a9e6c3a9aa83d7d2beac5a9bfbadfa3a70b7d9
Merge ... '4fe1dea49ed06e807afde9b963aafccb124edd4d'
     and 'aaffbdee48dde7a080e15c0f4d608f013c10a6ae'