Merge branch 'cbus'
authorTony Lindgren <tony@atomide.com>
Mon, 28 Sep 2009 18:42:56 +0000 (11:42 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 28 Sep 2009 18:42:56 +0000 (11:42 -0700)

Trivial merge