commit 9bd33224c5920173817a0b42f76d41c2fcd6ee37 Merge: 8b1b220 ead7c5d Author: Terje Røsten <terje.rosten at ntnu.no> Date: Sun Jan 30 18:34:31 2011 +0100 Initial pseudo merge for dist-git setup ---