Merge remote branch 'origin/master' into refactor
authorSamuel Rødal <samuel.rodal@nokia.com>
Fri, 5 Aug 2011 10:16:54 +0000 (12:16 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Fri, 5 Aug 2011 10:16:54 +0000 (12:16 +0200)

Trivial merge