Merge branch 'singleton_bus'
authorPeng Huang <shawn.p.huang@gmail.com>
Sat, 5 Jun 2010 01:41:10 +0000 (09:41 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Sat, 5 Jun 2010 01:41:10 +0000 (09:41 +0800)

Trivial merge