Merge remote-tracking branch 'gerrit/master' into newdocs
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>
Fri, 26 Oct 2012 10:25:43 +0000 (12:25 +0200)
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>
Fri, 26 Oct 2012 10:25:58 +0000 (12:25 +0200)
commit2f12c578fbf6bc047700abd0e1cd1ce15a90ff52
treedcc9d2166fcc979b6bc43c70b330db9c7acf0832
parent03143da00f27512376c75d346bfe2965cd73f13e
parenta397aef6b1bd828f3c9e209c48c627a33dee6e14
Merge remote-tracking branch 'gerrit/master' into newdocs

Change-Id: If531749e5b7113e693edb340ffe82f76ebe16c6b