Merge nmbug.tethera.net:nmbug-tags
authorDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Mon, 20 Feb 2012 13:17:35 +0000 (17:17 +0400)
committerDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Mon, 20 Feb 2012 13:17:35 +0000 (17:17 +0400)

Trivial merge