merge of '191f327932f99e02f2e0bd98ff435cfd9b439c23'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Jan 2007 13:27:58 +0000 (13:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Jan 2007 13:27:58 +0000 (13:27 +0000)
     and '3c96b014ef2dbcdb79faf2c1b5dbbc4d0d2d7660'


Trivial merge