[djview4/f13/master: 3/3] Initial pseudo merge for dist-git setup

[terjeros]

commit 5c26169614e8e462ef27b30e537a0b02a9849f22
Merge: a01f877 7c98995
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sun Jan 30 18:05:36 2011 +0100

    Initial pseudo merge for dist-git setup

---