modified UserAction and UserEditor.
authorMarkus Gerdelmann <mdman@mdman.de>
Wed, 31 Aug 2011 14:08:08 +0000 (16:08 +0200)
committerMarkus Gerdelmann <mdman@mdman.de>
Wed, 31 Aug 2011 14:08:08 +0000 (16:08 +0200)

Trivial merge