Merge branch 'master' into tizen_2.2
authorhhh.kwon <hhh.kwon@samsung.com>
Tue, 18 Jun 2013 07:44:46 +0000 (16:44 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Tue, 18 Jun 2013 07:45:15 +0000 (16:45 +0900)
Change-Id: Ib7a7fb0122b86b0422c65f11d7c0cc4464c1ebf3


Trivial merge