merge of '36abf7efee02c5e3db7a7239d57a793afbf6452a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Aug 2007 18:26:06 +0000 (18:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Aug 2007 18:26:06 +0000 (18:26 +0000)
     and '92611c6d615003e779f40cd25bf609edd0822a6a'


Trivial merge