Merge branch 'master' into tizen_2.1
authorMi-Ju Lee <miju52.lee@samsung.com>
Fri, 19 Apr 2013 13:33:51 +0000 (22:33 +0900)
committerMi-Ju Lee <miju52.lee@samsung.com>
Fri, 19 Apr 2013 13:34:03 +0000 (22:34 +0900)
Change-Id: I884d208e2145d3d487f337bd06af90402b7249b2


Trivial merge