merge of 'e4ac19c8fb4b1bbdef43e088c2683bcbf2c68ce4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 16:37:50 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 16:37:50 +0000 (16:37 +0000)
     and 'f0eacab861487e4f57866eb471b16e78a2167a7e'


Trivial merge