Merge commit 'origin/master'
commit6b082d6ae3f074b69e03a3f2d006cb3ef5391688
authorSlaven Rezic <slaven@rezic.de>
Wed, 5 Nov 2008 23:17:39 +0000 (6 00:17 +0100)
committerSlaven Rezic <slaven@rezic.de>
Wed, 5 Nov 2008 23:17:39 +0000 (6 00:17 +0100)
treeb92e88fcbc178372efc9721b3adc894c2b1e2c9e
parent790f176b4f7d20c1ea70c8c69028f6b3240ce37e
parentf5ba23de1d29db1a82b5e16d9b9f56f7708d247e
Merge commit 'origin/master'