Merge branch 'trini/canadian-final-merge' into org.openembedded.dev
authorTom Rini <trini@embeddedalley.com>
Thu, 29 Jan 2009 00:21:21 +0000 (19:21 -0500)
committerTom Rini <trini@embeddedalley.com>
Thu, 29 Jan 2009 00:21:21 +0000 (19:21 -0500)

Trivial merge