merge of '16e6a3ff4cb1c69984bf7ae782e19b11c3d95e44'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 23 Apr 2008 00:35:34 +0000 (00:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 23 Apr 2008 00:35:34 +0000 (00:35 +0000)
     and 'f2d24d867c478e840f017de36fe85bacaa8a0e42'


Trivial merge