Merge trini/canadian-merge branch into org.openembedded.dev, fixup a
authorTom Rini <trini@embeddedalley.com>
Tue, 27 Jan 2009 23:03:07 +0000 (18:03 -0500)
committerTom Rini <trini@embeddedalley.com>
Tue, 27 Jan 2009 23:03:07 +0000 (18:03 -0500)
commit2ae4d66192f2db96bbd79ddcc33e6aac7c1bd960
tree11a2c7c90703d8034d755297e156b420c075c8e7
parentffee230ed0b6c49ef4a0b23bc850b843c429f19a
parent04c9615b938eaabfbadc99c1707eb44657c95a61
Merge trini/canadian-merge branch into org.openembedded.dev, fixup a
conflict on checksums.ini
conf/bitbake.conf
conf/checksums.ini