Merge branch 'master' into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Mon, 22 Apr 2013 07:13:53 +0000 (10:13 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Mon, 22 Apr 2013 07:13:53 +0000 (10:13 +0300)

Trivial merge