merge of '14adef1cb8437a9298373d856f25c230125dcdf6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Feb 2008 11:27:25 +0000 (11:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Feb 2008 11:27:25 +0000 (11:27 +0000)
     and 'b1eda41fd5a73d8e2f521e7ad1668a7736e90afd'


Trivial merge