merged tridge's code
authorPeter Somogyi <psomogyi@gamax.hu>
Thu, 22 Feb 2007 17:25:18 +0000 (18:25 +0100)
committerPeter Somogyi <psomogyi@gamax.hu>
Thu, 22 Feb 2007 17:25:18 +0000 (18:25 +0100)

Trivial merge