Merge branch '6.x-3.x' of git.drupal.org:project/views into 6.x-3.x
authorDaniel Wehner
Sat, 26 Nov 2011 18:46:38 +0000 (19:46 +0100)
committerDaniel Wehner
Sat, 26 Nov 2011 18:46:38 +0000 (19:46 +0100)

Trivial merge