Merge branch 'release-5.17.1' into blead
authorJesse Luehrs <doy@tozt.net>
Wed, 20 Jun 2012 17:54:09 +0000 (12:54 -0500)
committerJesse Luehrs <doy@tozt.net>
Wed, 20 Jun 2012 17:54:09 +0000 (12:54 -0500)

Trivial merge