Revision c3353635e1374fdb0204a44cee1bea8c4973ea28

Committed on 29/08/2012 7:12 am by Arne <bratt@nvg.ntnu.no> [GitHub Diff]

Merge remote-tracking branch 'origin/master'