merge of '208141d537190684b567c64480e7d161f5be0d76'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jun 2007 10:45:36 +0000 (10:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jun 2007 10:45:36 +0000 (10:45 +0000)
     and 'e405f1aef095e5a2011a5ac844ef2cd3598e6f76'


Trivial merge