merge of '08199c52a592fe71e2675200cf618a439d710884'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jun 2008 22:07:04 +0000 (22:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jun 2008 22:07:04 +0000 (22:07 +0000)
     and '3e5f187370604cf4577025ebc49d90ca52a72d4d'


Trivial merge