Merge cbus into tmp-rebuild-1255129783
authorTony Lindgren <tony@atomide.com>
Fri, 9 Oct 2009 23:09:47 +0000 (16:09 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Oct 2009 23:09:47 +0000 (16:09 -0700)
Merge branch 'cbus' into tmp-rebuild-1255129783


Trivial merge