Merge Tizen_2.1 from Private
authorJunyong Sim <junyong.sim@samsung.com>
Wed, 10 Apr 2013 02:42:13 +0000 (11:42 +0900)
committerJunyong Sim <junyong.sim@samsung.com>
Wed, 10 Apr 2013 02:42:13 +0000 (11:42 +0900)
Change-Id: I5224aea41a74b28822020c14556459561521985e


Trivial merge