Merge branch '7.x-3.x' of git.drupal.org:project/omega into 7.x-3.x 7.x-3.0-alpha4
authorSebastian Siemssen
Wed, 25 May 2011 21:09:38 +0000 (23:09 +0200)
committerSebastian Siemssen
Wed, 25 May 2011 21:09:38 +0000 (23:09 +0200)

Trivial merge