Merge branch 'master' into drzb2011.3 drzb2011.3
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 8 Nov 2010 17:54:00 +0000 (18:54 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 8 Nov 2010 17:54:00 +0000 (18:54 +0100)

Trivial merge