Merge remote-tracking branch 'remotes/origin/develop' into release
authorTaeyoung Son <taeyoung2.son@samsung.com>
Mon, 27 Aug 2012 09:26:15 +0000 (18:26 +0900)
committerTaeyoung Son <taeyoung2.son@samsung.com>
Mon, 27 Aug 2012 09:26:15 +0000 (18:26 +0900)
Change-ID: I76430b3070c22edd4da9ede6d2fbb0d2144c007d


Trivial merge