Merge branch '1767' into dev
authorPA Parent <paparent@paparent.me>
Mon, 25 Jul 2011 13:04:01 +0000 (09:04 -0400)
committerPA Parent <paparent@paparent.me>
Mon, 25 Jul 2011 13:04:01 +0000 (09:04 -0400)

Trivial merge