Merge branch 'clients'
authorWard Vandewege <ward@jhvc.com>
Wed, 10 Apr 2013 15:40:48 +0000 (11:40 -0400)
committerWard Vandewege <ward@jhvc.com>
Wed, 10 Apr 2013 15:40:48 +0000 (11:40 -0400)

Trivial merge