Merge branch 'master' into tizen_2.1
authorMi-Ju Lee <miju52.lee@samsung.com>
Mon, 25 Mar 2013 08:07:40 +0000 (17:07 +0900)
committerMi-Ju Lee <miju52.lee@samsung.com>
Mon, 25 Mar 2013 08:07:58 +0000 (17:07 +0900)
Change-Id: If04a3f15c48f6add72cedc27c8f626cfe84f4ecd


Trivial merge