Merge branch 'master' into mpx
authorPeter Hutterer <peter@cs.unisa.edu.au>
Mon, 2 Apr 2007 07:12:46 +0000 (16:42 +0930)
committerPeter Hutterer <peter@cs.unisa.edu.au>
Mon, 2 Apr 2007 07:12:46 +0000 (16:42 +0930)

Trivial merge