merge of '680351f441a2d128e922fe75529f1c41aa00994e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 18:12:35 +0000 (18:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jun 2007 18:12:35 +0000 (18:12 +0000)
     and '77b2a37e6b04513442adb1c4d27e5116cdb6fdc6'


Trivial merge