merge of aca49b567863b4486c3e93b6a74baee4e3679916
authorDavid Karlstrom <daka@thg.se>
Sat, 30 Jul 2005 19:18:53 +0000 (19:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 19:18:53 +0000 (19:18 +0000)
commit22d73880c4233315af2b8c1459cd1e01d720648f
treeccec79da959ef1ba026af53e7d40b8e8c208dcde
parent69b71953ab2ac88c4bb2e374e350c1432be8a56f
parent6e48fbc5c8cb29f59c27fb02271f552b0ec57396
merge of aca49b567863b4486c3e93b6a74baee4e3679916
     and f0e0882a2b8b4ba770bd84253b5b9d883303fac7