Merge http://nmbug.tethera.net/git/nmbug-tags
authorJani Nikula <jani@nikula.org>
Mon, 1 Apr 2013 09:45:23 +0000 (12:45 +0300)
committerJani Nikula <jani@nikula.org>
Mon, 1 Apr 2013 09:45:23 +0000 (12:45 +0300)

Trivial merge