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


Trivial merge