Revision 0766ec1ae464d0d3e284926157fa5a0b5860d951

Committed on 07/05/2012 7:54 am by Arne <bratt@nvg.ntnu.no> [GitHub Diff]

Original merge extension