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)
commitfa8e1afd1dfad63e1edef986601f8788b5e40f39
tree43e4863e922ebc1f62e4f5cb07119e3c604e070a
parent5e4e06663099c1b2f193068d38654f9ced7f48aa
parent9612af5dc0ec7de0b8583a8f63bee0e30a033460
Merge ... '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
     and '7955ac422c8c76405d5746534f35c9703c7f2f09'