Merge branch 'master' into tizen_2.1
authorEunmi Son <eunmi.son@samsung.com>
Wed, 27 Mar 2013 14:16:31 +0000 (23:16 +0900)
committerEunmi Son <eunmi.son@samsung.com>
Wed, 27 Mar 2013 14:16:31 +0000 (23:16 +0900)

Trivial merge