merge of '3a2808f816787c38cc33d4ad7c1d8ec24cf3f97d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jul 2008 13:47:45 +0000 (13:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Jul 2008 13:47:45 +0000 (13:47 +0000)
     and 'bab230e17300cd6d489ec78a189a3c829743cdd4'


Trivial merge