merge of '65908f491852a7129b196ced660449bcc1933f90'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Aug 2008 06:35:35 +0000 (06:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Aug 2008 06:35:35 +0000 (06:35 +0000)
     and 'f4dabead7ddd765bb651fb44cd9e5d48fb582330'


Trivial merge