Merge branch 'folks-async-and-prepare'
authorTravis Reitter <treitter@gmail.com>
Tue, 27 Jul 2010 10:54:06 +0000 (12:54 +0200)
committerTravis Reitter <treitter@gmail.com>
Tue, 27 Jul 2010 10:54:06 +0000 (12:54 +0200)

Trivial merge