merge of 'ca64733fdcd777798e0a455c06c3a4f22c39edcc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Aug 2007 09:15:53 +0000 (09:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Aug 2007 09:15:53 +0000 (09:15 +0000)
     and 'f8fdacfa8f57faee589fa77524dbae4f97928b5d'


Trivial merge