merge of '28f2be15a1987cef44b7ffbdc930f5e483a49de4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 May 2008 00:31:27 +0000 (00:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 May 2008 00:31:27 +0000 (00:31 +0000)
     and 'b0651d742b7cf6671d07f2ab5026e017142e5166'


Trivial merge