Merge remote-tracking branch 'queatz/privs'
authorPerttu Ahola <celeron55@gmail.com>
Tue, 30 Aug 2011 11:23:44 +0000 (14:23 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Tue, 30 Aug 2011 11:23:44 +0000 (14:23 +0300)

Trivial merge