merge of '4ff3a98585b83fc6b2da66523e59d09c1ce39b20'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Sep 2008 12:30:58 +0000 (12:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Sep 2008 12:30:58 +0000 (12:30 +0000)
     and '6950cb0adadcf0fa171ec2fdd0751373a16fa294'


Trivial merge