merge of 01f1ccec23eb7fc423ff878a513ff4a2aa0847b4
authorGraeme Gregory <dp@xora.org.uk>
Tue, 30 May 2006 14:14:46 +0000 (14:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 May 2006 14:14:46 +0000 (14:14 +0000)
commit98ca1289c3a1619faf33b4d59857998810ad31e3
treeab19fc315f944f82de812c9869c3ed40a9e29da8
parent4f24cb935d1a18bc5b5215934f659d3be6f69049
parent135dd94094b635ef1a3e7935c4d9d5ca0204698b
merge of 01f1ccec23eb7fc423ff878a513ff4a2aa0847b4
     and 1ebed2257b095d2f7f67acd91f0979bd1f8c79a9