Merge branch 'refs/heads/tizen_2.1' into tizen_2.2
authorChangyong Jeon <fin10.jeon@samsung.com>
Wed, 5 Jun 2013 10:57:03 +0000 (19:57 +0900)
committerChangyong Jeon <fin10.jeon@samsung.com>
Wed, 5 Jun 2013 10:57:03 +0000 (19:57 +0900)
Change-Id: Idfeb62ae3b10a2f955d39536c70bc77621a650e6


Trivial merge