Merge remote-tracking branch 'gerrit/master' into newdocs
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>
Tue, 16 Oct 2012 08:43:36 +0000 (10:43 +0200)
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>
Tue, 16 Oct 2012 08:46:48 +0000 (10:46 +0200)
Change-Id: If2168c519daf45390af04af9ef9722770453a493


Trivial merge