Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:36:57 +0000 (10:36 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:37:34 +0000 (10:37 +0100)
Change-Id: If338bfeddf4cbd1c2ea8d4335399db21f44fbf4c


Trivial merge