merge of '0f8b09e59a3ffe93fca2a32d5d27746f0c582cd4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Mar 2008 12:37:10 +0000 (12:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Mar 2008 12:37:10 +0000 (12:37 +0000)
     and '495d10204bc69808fdd0046f98503c0240e1ebf7'


Trivial merge