Merge trini/canadian-merge branch into org.openembedded.dev, fixup a

conflict on checksums.ini

diff --cc conf/bitbake.conf
Simple merge

diff --cc conf/checksums.ini
index d8355ad,92c66ab..d48903a
--- 1/conf/checksums.ini
--- 2/conf/checksums.ini
+++ b/conf/checksums.ini
@@@ -6230,10 -6090,30 +6234,34 @@@ sha256=bfbf487731ad5dca37efe480a837417d
  md5=5dfac5da961ecd5f227c3175859a486d
  sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
  
 +[http://gcc.releasenotes.org/releases/gcc-4.3.3/gcc-4.3.3.tar.bz2]
 +md5=cc3c5565fdb9ab87a05ddb106ba0bd1f
 +sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
 +
+ [http://downloads.sourceforge.net/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz]
+ md5=30154205636c12c6abcc462ce07550cf
+ sha256=404358fe19326679f602de6f7d6a2db180e27af83813150f58ab28eec197b646
+ 
+ [http://downloads.sourceforge.net/mingw/gcc-core-3.4.5-20060117-2-src.tar.gz]
+ md5=d0dc9d57d493889bc1ca88b127290b9d
+ sha256=a21c2f48bb48d62935ee955ac8fa318658861f6316f30feb3cdec5337abf7f05
+ 
+ [http://downloads.sourceforge.net/mingw/gcc-g++-3.4.5-20060117-2-src.tar.gz]
+ md5=ca81c8420ab9d1d05ff9c73a9d4f7d63
+ sha256=d54078fdccaa3776927b3931c15b880c43e76cb6a0fb59594d1b85cfc89356e9
+ 
+ [http://downloads.sourceforge.net/mingw/gcc-g77-3.4.5-20060117-2-src.tar.gz]
+ md5=57d489658743f0d9048e440b312740c8
+ sha256=3ea32832e07571be317cdb1f9b9dc678a51ad2c2f066f91e155c449d0cf7d796
+ 
+ [http://downloads.sourceforge.net/mingw/gcc-java-3.4.5-20060117-2-src.tar.gz]
+ md5=96b039f4e11bff4d3d8a4e7da6e3998d
+ sha256=ec7a963c0dfd986697350be26e53577b0a39c86970b4e9485d85ca99b0cb2197
+ 
+ [http://downloads.sourceforge.net/mingw/gcc-objc-3.4.5-20060117-2-src.tar.gz]
+ md5=2bffc1e314f2efb1034b3d3ea1ce2f7d
+ sha256=a8a3c0f0a38f819b87ff9282f1e40536f5050153f0f60db5c869509a70497c2c
+ 
  [http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.gz]
  md5=fc49f45251c1336fe1dad5dba1c83fcd
  sha256=fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92