Merge remote-tracking branch 'refs/remotes/npigeon/ticket-660'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 26 Apr 2013 21:08:39 +0000 (16:08 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 26 Apr 2013 21:08:39 +0000 (16:08 -0500)

Trivial merge