merge of 11e32f6f530670e04143728af2b7b193a6d33ba2
authorAdrian Davey <ade@beth2.org>
Mon, 16 Jan 2006 16:05:31 +0000 (16:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 16:05:31 +0000 (16:05 +0000)
     and 36b037a423c8b35b017dc3b821094d570ea82d5a


Trivial merge