eg. 'wrapper', 'category:python' or '"document database"'
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x