merge of '0b435292ad4bcac5c77643e4c7106c40b13d44e2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 26 Jan 2008 07:15:58 +0000 (07:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 26 Jan 2008 07:15:58 +0000 (07:15 +0000)
     and '10d839841515280475537b389b383e3e3686c117'


Trivial merge