Merge nmbug.tethera.net:nmbug-tags
authorJani Nikula <jani@nikula.org>
Sun, 2 Sep 2012 20:01:48 +0000 (23:01 +0300)
committerJani Nikula <jani@nikula.org>
Sun, 2 Sep 2012 20:01:48 +0000 (23:01 +0300)

Trivial merge