Merge branch '6.x-3.x' of git.drupal.org:project/fb into 6.x-3.x
authorDave Cohen
Wed, 1 Jun 2011 21:25:53 +0000 (14:25 -0700)
committerDave Cohen
Wed, 1 Jun 2011 21:25:53 +0000 (14:25 -0700)

Trivial merge