Merged in two missing changes from f-visibility tree.
authorMonty Taylor <mordred@inaugust.com>
Wed, 8 Jul 2009 18:58:47 +0000 (11:58 -0700)
committerMonty Taylor <mordred@inaugust.com>
Wed, 8 Jul 2009 18:58:47 +0000 (11:58 -0700)

Trivial merge