Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 31 Jan 2011 10:34:39 +0000 (12:34 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 31 Jan 2011 10:34:39 +0000 (12:34 +0200)
commit30a7e3994baec598749b7b9ee8ca2d89d895d5fb
treecf9bc89c98e38cf6e0e0b76241b9bee88d1d21cf
parent2f7cf0ec6a345f388f4df4bdbf87efa3015d3f7c
parent6ef2b7d1f94844100912aefbd97565872c81c264
Merge branch 'master' into harmattan