merge of 'ca8372038767a35e63d1e9dbba1a00401241ff28'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Jan 2007 09:57:07 +0000 (09:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Jan 2007 09:57:07 +0000 (09:57 +0000)
     and 'd382786b6a8c504afd4a305cff2554679c82c72a'


Trivial merge