Merge branch 'master' into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Mon, 8 Apr 2013 09:24:40 +0000 (12:24 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Mon, 8 Apr 2013 09:24:40 +0000 (12:24 +0300)

Trivial merge