Merge heads.
authorTrent Nelson <trent@trent.me>
Tue, 16 Oct 2012 15:10:40 +0000 (11:10 -0400)
committerTrent Nelson <trent@trent.me>
Tue, 16 Oct 2012 15:10:40 +0000 (11:10 -0400)

Trivial merge