Merge branch 'master' into devel
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 7 Apr 2011 19:55:40 +0000 (21:55 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 7 Apr 2011 19:55:40 +0000 (21:55 +0200)

Trivial merge