merge of '7e947a0c90014aa35b2d54a97a35dac21ecd4545'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 17:23:42 +0000 (17:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 17:23:42 +0000 (17:23 +0000)
     and 'ede2922a2a1c1c3eb84491c1cb019edc21f2729e'


Trivial merge