Merge branch 'master' into qml
authorSami Rämö <sami.ramo@ixonos.com>
Thu, 18 Nov 2010 09:19:16 +0000 (11:19 +0200)
committerSami Rämö <sami.ramo@ixonos.com>
Thu, 18 Nov 2010 09:19:16 +0000 (11:19 +0200)

Trivial merge