Merge branch 'no_snooper_apps'
authorPeng Huang <shawn.p.huang@gmail.com>
Mon, 3 May 2010 23:29:45 +0000 (07:29 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Mon, 3 May 2010 23:29:45 +0000 (07:29 +0800)

Trivial merge