Merge nmbug.tethera.net:nmbug-tags
authorDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Sun, 4 Mar 2012 19:29:44 +0000 (23:29 +0400)
committerDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Sun, 4 Mar 2012 19:29:44 +0000 (23:29 +0400)

Trivial merge