merge of '4fec7547828d90c8b430bc08cb12a80b9091750b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Apr 2008 10:07:27 +0000 (10:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Apr 2008 10:07:27 +0000 (10:07 +0000)
     and 'ee1c0d99f2549754c9cb3cf471c5d3e68e42087d'


Trivial merge