Merge branch 'master' into app
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 11 Nov 2010 17:02:45 +0000 (18:02 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 11 Nov 2010 17:02:45 +0000 (18:02 +0100)

Trivial merge