merge of 40d5e9c9fe36e79128f6aa23880c5666be230cfc
authorGraeme Gregory <dp@xora.org.uk>
Tue, 18 Apr 2006 22:18:54 +0000 (22:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Apr 2006 22:18:54 +0000 (22:18 +0000)
commit488948e734ad107639099e558f5e6fb7dde6d7d9
tree56bfdff025634c1645981aabb9d27a69ba117261
parent9f59be500149641e1009090ac607cd7f84b9e1a2
parent044e0778328cf0ecc3ded99f014ead4bbcedaa7a
merge of 40d5e9c9fe36e79128f6aa23880c5666be230cfc
     and a2ab0d3faec30d3c8b605acc999e9380620e2e5f