Merge branch 'master' into bishop_pin_clop
authorGary Linscott <glinscott@gmail.com>
Thu, 14 Feb 2013 02:41:15 +0000 (21:41 -0500)
committerGary Linscott <glinscott@gmail.com>
Thu, 14 Feb 2013 02:41:15 +0000 (21:41 -0500)

Trivial merge