merge of 'b5c2080b62dd6480fdd3b3687e291ee915379afd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Mar 2008 11:12:50 +0000 (11:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Mar 2008 11:12:50 +0000 (11:12 +0000)
     and 'c49f478890b0d92c1c59e4c0cf0d74b6990e6745'


Trivial merge