Merge http://nmbug.tethera.net/git/nmbug-tags
authorJani Nikula <jani@nikula.org>
Mon, 2 Sep 2013 17:57:31 +0000 (20:57 +0300)
committerJani Nikula <jani@nikula.org>
Mon, 2 Sep 2013 17:57:31 +0000 (20:57 +0300)

Trivial merge