Merge branch 'master' into 3M-810
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 9 Aug 2010 17:12:50 +0000 (19:12 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 9 Aug 2010 17:12:50 +0000 (19:12 +0200)

Trivial merge