merge of 141bf23dcf6e128a2155bf385cf3dc153be58cbb
authorGraeme Gregory <dp@xora.org.uk>
Fri, 22 Jul 2005 09:40:50 +0000 (09:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 09:40:50 +0000 (09:40 +0000)
commit85c8842ef4de45230165b92b9bd70100594927e5
tree6e960f373f1080012efb6fcff8cbaffc30276ee7
parentdcf243861b11b8ed8264a622ce98b1dcd8c7d837
parentf98a7c864e7637132fb52acb596d667bc77384ea
merge of 141bf23dcf6e128a2155bf385cf3dc153be58cbb
     and e2b4fef7a158b3669ddc135bad1d8b23c7a59015