Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:24:08 +0000 (10:24 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:24:45 +0000 (10:24 +0100)
Change-Id: Ia45daee9b5089c01300cf27484296809dd87302f


Trivial merge