merge of '6627fe3d8e910c726c2e9107f629937eb0b9b38b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 7 Feb 2008 16:49:11 +0000 (16:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 7 Feb 2008 16:49:11 +0000 (16:49 +0000)
     and '74712093023d92089b1e3d1b9b4469113ff9a66c'


Trivial merge