Merge pull request #3253 from t-nelson/pivos_settings_display_fixes
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Sat, 14 Sep 2013 08:41:53 +0000 (01:41 -0700)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Sat, 14 Sep 2013 08:41:53 +0000 (01:41 -0700)
Pivos settings display fixes


Trivial merge