Revision 582b999139fa2e3986fecf7818b5813407e5926a

Committed on 24/09/2012 5:22 am by Arne <bratt@nvg.ntnu.no> [GitHub Diff]

Merge remote-tracking branch 'origin/master'