Merge branch 'experimental' into cookie_daemon
authorMason Larobina <mason.larobina@gmail.com>
Sat, 1 Aug 2009 16:00:07 +0000 (00:00 +0800)
committerMason Larobina <mason.larobina@gmail.com>
Sat, 1 Aug 2009 16:00:07 +0000 (00:00 +0800)

Trivial merge