Merge branch '7.x-3.x' of git.drupal.org:project/delta into 7.x-3.x
authorSebastian Siemssen
Wed, 20 Apr 2011 23:37:57 +0000 (01:37 +0200)
committerSebastian Siemssen
Wed, 20 Apr 2011 23:37:57 +0000 (01:37 +0200)

Trivial merge