merge of '154202574ebfd29256ed7276e3e9e0a12972ab15'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 11 Oct 2006 15:44:40 +0000 (15:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 11 Oct 2006 15:44:40 +0000 (15:44 +0000)
commit0249326d4b2997b4791d3dae4274826aac7eb613
treec512a24e49035d2057bbdd4437a6b8bc1969b794
parent5677e5a127defb332778feeea849d2b240367eb9
parent4502fec60e18eb0b06cd16035491ac0252477f5c
Merge ... '154202574ebfd29256ed7276e3e9e0a12972ab15'
     and '9620e56cde605bf1b74be65fd400fb3044fb98e8'
conf/machine/h2200.conf