Sync with tizen_2.2 submit/tizen/20130828.070518 submit/tizen/20130829.003713
authorhb.min <hb.min@samsung.com>
Tue, 27 Aug 2013 11:22:08 +0000 (20:22 +0900)
committerhb.min <hb.min@samsung.com>
Tue, 27 Aug 2013 11:29:33 +0000 (20:29 +0900)

Trivial merge