Merge branch 'master' into tizen_2.1
authorMi-Ju Lee <miju52.lee@samsung.com>
Thu, 18 Apr 2013 12:10:44 +0000 (21:10 +0900)
committerMi-Ju Lee <miju52.lee@samsung.com>
Thu, 18 Apr 2013 12:11:01 +0000 (21:11 +0900)
Change-Id: I2ef1d24d3afb77f740dc200a80adc8d9e1ab4c1d


Trivial merge