Revision 7904b69d4ce1ab0b36385d5fa49c447275ef6938

Committed on 15/12/2011 1:50 am by Christian Pfeffer Gjengedal <cpg@ez.no> [GitHub Diff]

Merge branch 'next'