Merge branch 'master' into msglevel
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 20 Oct 2009 21:21:39 +0000 (23:21 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 20 Oct 2009 21:21:39 +0000 (23:21 +0200)

Trivial merge