Merge nmbug.tethera.net:nmbug-tags
authorDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Wed, 8 Feb 2012 16:58:22 +0000 (20:58 +0400)
committerDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Wed, 8 Feb 2012 16:58:22 +0000 (20:58 +0400)

Trivial merge