Merge remote-tracking branch 'ktdreyer/master'
authorDerrik Pates <demon@now.ai>
Tue, 25 Oct 2011 14:23:27 +0000 (08:23 -0600)
committerDerrik Pates <demon@now.ai>
Tue, 25 Oct 2011 14:23:27 +0000 (08:23 -0600)

Trivial merge