merge of '68489b715c5546518441c5f32f9be801448273b5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Aug 2007 16:37:27 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Aug 2007 16:37:27 +0000 (16:37 +0000)
     and '9b3b2dfff550ab71102166ac73cb9b011707a51f'


Trivial merge