Merge nmbug.tethera.net:nmbug-tags
authorDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Sat, 24 Dec 2011 03:56:43 +0000 (07:56 +0400)
committerDmitry Kurochkin <dmitry.kurochkin@gmail.com>
Sat, 24 Dec 2011 03:56:43 +0000 (07:56 +0400)

Trivial merge