merge of 1aee6898e54c0e2037c99cd8999670a4fe1c0c02
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Jul 2006 15:16:25 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 15:16:25 +0000 (15:16 +0000)
commit86d9211f52171f3367ce974b997e16864e20118d
treec13176285e52845d0ae41b85feb14011a0ec2a50
parent35cc20b2ea130e7f90288cb478072a1b93beba98
parentd1e85e122506700d5e37e099326b2e3c8740bdc8
merge of 1aee6898e54c0e2037c99cd8999670a4fe1c0c02
     and 348eb2d8dd45b73446471873775d8e248e67bd32