merge of '3f1764c83d30f9c56414571c8dfb513f7146c49d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Nov 2007 16:37:43 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Nov 2007 16:37:43 +0000 (16:37 +0000)
     and '5c37eafbefc54ff05826ce32eaad994791ea1a06'


Trivial merge