merge of '55a31408b86b4036d83b855bbd46f1b1d7a61765'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 19:48:00 +0000 (19:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 19:48:00 +0000 (19:48 +0000)
     and 'aa36aa92826b8f74328b39933671dd201b795054'


Trivial merge