merge of '3ce0d02c7834c67ffd0b00887b8ce99c86d15ab3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Oct 2007 11:03:01 +0000 (11:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Oct 2007 11:03:01 +0000 (11:03 +0000)
     and '7de13708db4eda87a383ef97dda7684986e0e563'


Trivial merge