merge of '81c87e5195c33ef6ed29868b074d16176f177c69'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Aug 2008 23:08:23 +0000 (23:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Aug 2008 23:08:23 +0000 (23:08 +0000)
     and 'b276360ffd472780ff8a2ecb78b15b2b96691746'


Trivial merge