merge of '4b8f7f26130f7634d42162742570341b8a7446b0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Sep 2007 14:59:19 +0000 (14:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Sep 2007 14:59:19 +0000 (14:59 +0000)
     and '8eb033e1267761674286fcf266b81e02c35fa3d6'


Trivial merge