Merge branch 'experimental' into cookie_daemon
authorMason Larobina <mason.larobina@gmail.com>
Thu, 30 Jul 2009 13:15:04 +0000 (21:15 +0800)
committerMason Larobina <mason.larobina@gmail.com>
Thu, 30 Jul 2009 13:15:04 +0000 (21:15 +0800)

Trivial merge