merge of 'b639cdcd3a5ec92891fd473c2d394b25a71fd952'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jul 2008 16:42:57 +0000 (16:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jul 2008 16:42:57 +0000 (16:42 +0000)
     and 'bbce239c4885eaa9f426e8a14add98f0c6bb67b9'


Trivial merge