merge of '1d0e13e8c6528e7a7037276e3c01cb21dfa085e4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Oct 2007 16:35:01 +0000 (16:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Oct 2007 16:35:01 +0000 (16:35 +0000)
     and '86581f7de9bc72fe5e21778b4442cc0e59e96fbf'


Trivial merge