merged tridge's branch
authorPeter Somogyi <psomogyi@gamax.hu>
Thu, 26 Apr 2007 13:35:03 +0000 (15:35 +0200)
committerPeter Somogyi <psomogyi@gamax.hu>
Thu, 26 Apr 2007 13:35:03 +0000 (15:35 +0200)
commit9f76f0fc94cedc2ac775181033c2484d56ccfed0
treee1ca2edcdc29bc93ce9c8ac1b61f6bbe771a77ff
parent02ec7d6abb75a7c0a414efd4a50d44e6f1e5e407
parent9755f9c62fd14abc65189fc06629f37546f53082
merged tridge's branch