Merge nmbug.tethera.net:nmbug-tags
authorSebastian Spaeth <Sebastian@SSpaeth.de>
Mon, 2 Jan 2012 15:38:58 +0000 (16:38 +0100)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Mon, 2 Jan 2012 15:38:58 +0000 (16:38 +0100)

Trivial merge