Merge branch 'master' into ding1-theme
authorJason Skomorowski <jason@indexdata.com>
Tue, 5 Apr 2011 14:45:23 +0000 (14:45 +0000)
committerJason Skomorowski <jason@indexdata.com>
Tue, 5 Apr 2011 14:45:23 +0000 (14:45 +0000)

Trivial merge