Revision ce9c3c649d9404cb2d900be96782decbc9aab820

Committed on 09/01/2013 4:04 am by Arne <bratt@nvg.ntnu.no> [GitHub Diff]

Merge remote-tracking branch 'origin/master'