merge of '23c1fc66a29e279d192d2dee8c7a1603361063b7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 May 2007 21:19:04 +0000 (21:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 May 2007 21:19:04 +0000 (21:19 +0000)
     and '6f71e952a3b0871abd3462a5811c09eaeff9a20b'


Trivial merge