Merge branch 'qdeclarativeview2' into harmattan
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 25 Jul 2011 11:05:36 +0000 (14:05 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 25 Jul 2011 11:05:36 +0000 (14:05 +0300)

Trivial merge