Merge remote-tracking branch 'gerrit/master' into newdocs
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>
Fri, 19 Oct 2012 07:53:42 +0000 (09:53 +0200)
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>
Fri, 19 Oct 2012 07:54:12 +0000 (09:54 +0200)
Change-Id: If7f46d56cf0b0b79f7fc8955a01964121b900d07


Trivial merge