[oe-commits] Tom Rini : Merge trini/canadian-merge branch into org.openembedded.dev, fixup a

[GIT User account]

Module: openembedded.git
Branch: ieee80215
Commit: 2ae4d66192f2db96bbd79ddcc33e6aac7c1bd960
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2ae4d66192f2db96bbd79ddcc33e6aac7c1bd960

Author: Tom Rini <trini at embeddedalley.com>
Date:   Tue Jan 27 18:03:07 2009 -0500

Merge trini/canadian-merge branch into org.openembedded.dev, fixup a
conflict on checksums.ini

---