Merge branch 'gh/conform'
commit6d9bafc5b480cbd8f44de943e173b6dd314619ba
authorHenrik Tidefelt <tidde@59-50.isylogon.isy.liu.se>
Tue, 15 Dec 2009 09:19:30 +0000 (15 10:19 +0100)
committerHenrik Tidefelt <tidde@59-50.isylogon.isy.liu.se>
Tue, 15 Dec 2009 09:19:30 +0000 (15 10:19 +0100)
treec520ae29ca187a78652a4c0b419a5d1010e438d1
parent386e43ca480a733676a90dcb254096a3243188e2
parent6b2f506ca437269a759b98fa0b464bf1ecfac225
Merge branch 'gh/conform'