merge of '5917d0f1af10ed2d5da45d6f72d648b629e1cb40'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 22:48:10 +0000 (22:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 22:48:10 +0000 (22:48 +0000)
     and '5bd5703a4e0b185912bdd76a025e64b961d8044b'


Trivial merge