[extrema/f13/master: 5/5] Initial pseudo merge for dist-git setup

[terjeros]

commit 95c89e4d0967b2aac09024e998de5513bf8831fd
Merge: 104a0fb 5033620
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sun Jan 30 22:47:59 2011 +0100

    Initial pseudo merge for dist-git setup

---