Merge branch 'master' into tizen_2.2 accepted/tizen_2.2/20131127.092241 submit/tizen_2.2/20131127.091900
authorhhh.kwon <hhh.kwon@samsung.com>
Wed, 27 Nov 2013 08:46:09 +0000 (17:46 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Wed, 27 Nov 2013 09:06:29 +0000 (18:06 +0900)
Change-Id: I3c251b1a0a3d157b728ee6816e1f9765fcd312ca


Trivial merge