Merge branch 'master' into tizen_2.1 tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.020455 accepted/tizen_2.1/20130520.093126 submit/tizen_2.1/20130424.222842 submit/tizen_2.1/20130516.045904
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Thu, 4 Apr 2013 11:52:04 +0000 (14:52 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Thu, 4 Apr 2013 11:52:04 +0000 (14:52 +0300)

Trivial merge