Merge branch 'org.openembedded.dev' of git.openembedded.net:openembedded into wip2
authorRichard Purdie <rpurdie@linux.intel.com>
Wed, 5 May 2010 23:34:02 +0000 (00:34 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Wed, 5 May 2010 23:34:02 +0000 (00:34 +0100)

Trivial merge