merge of '569e7d088bd81d3c7c545ac39e6e807ab3b47b36'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 09:48:51 +0000 (09:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 09:48:51 +0000 (09:48 +0000)
     and '85a8198c27d919f7d43639901b8c9925f284d7db'


Trivial merge