merge of '3f545ee3cd1a64b0dba17454c87e0a429236c7e7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Sep 2008 14:28:57 +0000 (14:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Sep 2008 14:28:57 +0000 (14:28 +0000)
     and 'd6dadd36c3b5c998171b7bf4c051fe5a2e82eba8'


Trivial merge