merge of '87d56af8b268b54c15065d21ee44d5a9ccbdbada'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jun 2007 15:28:57 +0000 (15:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jun 2007 15:28:57 +0000 (15:28 +0000)
     and 'a274867aa1114b795903e870451c68c2892dbea1'


Trivial merge