Merge branch 'master' into tizen_2.1 submit/tizen_2.1/20130514.052652
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Thu, 25 Apr 2013 09:08:49 +0000 (12:08 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Thu, 25 Apr 2013 09:08:49 +0000 (12:08 +0300)

Trivial merge