Merge branch 'master' into tizen_2.1
authorSeungyoun Ju <sy39.ju@samsung.com>
Fri, 29 Mar 2013 05:24:58 +0000 (14:24 +0900)
committerSeungyoun Ju <sy39.ju@samsung.com>
Fri, 29 Mar 2013 05:25:24 +0000 (14:25 +0900)
Change-Id: I7d763c70261f5286bbe66b43d4b7f65d260bc556


Trivial merge