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)
commitb47eabcdc4867968a5e030170806fafe4d1d3a0c
tree11565106fd23969f9ee1e6259b411e2e53a517e9
parentee7d30472c4d03a5a7ebe40d6247e6b56e11d3cd
parentd624259bd841f90f51fde9ebf536e1eda99be5a9
Merge ... '68489b715c5546518441c5f32f9be801448273b5'
     and '9b3b2dfff550ab71102166ac73cb9b011707a51f'