merge of '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jul 2007 13:33:02 +0000 (13:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jul 2007 13:33:02 +0000 (13:33 +0000)
     and '7955ac422c8c76405d5746534f35c9703c7f2f09'


Trivial merge