merge of 13813ab94ffee0d1aeb108014a63c4e4f408b77a
authorGraeme Gregory <dp@xora.org.uk>
Wed, 3 May 2006 20:19:52 +0000 (20:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 20:19:52 +0000 (20:19 +0000)
commit86fcc72ba9dc3abc185bd353b807bd13c25b1ab8
tree70539ae05d2d9b8dfd316449305dd5afbfa15168
parent995352d010c2bf8c0ce1e9f2379a59a7d3751c9b
parent59a67e65a62f1fd7f39122ae9d61cf17438d7870
merge of 13813ab94ffee0d1aeb108014a63c4e4f408b77a
     and b9e97e1ac980472265e7715ad0f37be8f9a86454