merge of a49a202a6edf7281ee0864e523a6292173b5be55
authorAdrian Davey <ade@beth2.org>
Mon, 16 Jan 2006 16:37:50 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 16:37:50 +0000 (16:37 +0000)
     and ae14c4dfff4901693990f432e22da76054ac4da8


Trivial merge