merge of 3ce032bdbeb30a4564e65dddfa419c4802edb0e8
authorGraeme Gregory <dp@xora.org.uk>
Fri, 5 May 2006 23:18:53 +0000 (23:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 23:18:53 +0000 (23:18 +0000)
commit22c23f03dd506f30d5ddef3d3f36deb9103103cb
tree996e9912609374d9e093968050fbbbd4630e196d
parent987f0243ed22a455d2b2fec3eaf3526cd37ac454
parentf93ffca8ac0f3a0b26894e2a18df0e1d0532e275
merge of 3ce032bdbeb30a4564e65dddfa419c4802edb0e8
     and 3d04ea60ec78bcaf5d3e5cd76d99e92c3b6c0885