commit 69adc7479b4dd85732b35866c05c9fda61729860 Merge: 6ec36ed ee38cdb Author: Terje Røsten <terje.rosten at ntnu.no> Date: Sun Jan 30 19:19:18 2011 +0100 Initial pseudo merge for dist-git setup ---