Merge branch 'master' into tizen
authorheeju.joo <heeju.joo@samsung.com>
Fri, 12 Jul 2013 06:07:25 +0000 (15:07 +0900)
committerheeju.joo <heeju.joo@samsung.com>
Fri, 12 Jul 2013 06:07:30 +0000 (15:07 +0900)
Change-Id: I08497196e2b9dbff96f688d2fc1d6e8f2f1f1e94


Trivial merge