Merge from master
authorJoshua Tolley <josh@endpoint.com>
Tue, 16 Apr 2013 20:16:53 +0000 (14:16 -0600)
committerJoshua Tolley <josh@endpoint.com>
Tue, 16 Apr 2013 20:16:53 +0000 (14:16 -0600)

Trivial merge