Merge branch 'master' into ding1-theme
authorJason Skomorowski <jason@indexdata.com>
Thu, 7 Apr 2011 02:25:11 +0000 (02:25 +0000)
committerJason Skomorowski <jason@indexdata.com>
Thu, 7 Apr 2011 02:25:11 +0000 (02:25 +0000)

Trivial merge