Merge branch 'master' into tizen_2.1
authorMi-Ju Lee <miju52.lee@samsung.com>
Wed, 17 Apr 2013 10:30:21 +0000 (19:30 +0900)
committerMi-Ju Lee <miju52.lee@samsung.com>
Wed, 17 Apr 2013 10:31:12 +0000 (19:31 +0900)
Change-Id: I3e9f76c7038f8d0d4afbc205fbda660c3fa58685


Trivial merge