Merge nmbug.tethera.net:nmbug-tags
authorMark Walters <markwalters1009@gmail.com>
Sat, 22 Dec 2012 14:13:41 +0000 (14:13 +0000)
committerMark Walters <markwalters1009@gmail.com>
Sat, 22 Dec 2012 14:13:41 +0000 (14:13 +0000)

Trivial merge