Merge branch 'master' into save_change
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 15:07:13 +0000 (17:07 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 3 Jun 2010 15:07:13 +0000 (17:07 +0200)

Trivial merge