Merge branch '6.x-3.x' of git://git.drupalcode.org/project/views into 6.x-3.x
authorDaniel Wehner
Fri, 27 Jan 2012 11:03:53 +0000 (12:03 +0100)
committerDaniel Wehner
Fri, 27 Jan 2012 11:03:53 +0000 (12:03 +0100)

Trivial merge