merge of '76e09c11f662f0aefe07fc28e38a77eb23fbe565'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 15:23:00 +0000 (15:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 15:23:00 +0000 (15:23 +0000)
     and '9f33f5482b192b902f1e1184679e1acb8e5ede52'


Trivial merge