Merge branch 'tizen_2.1' into tizen_2.2
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:05:31 +0000 (11:05 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Jun 2013 02:05:38 +0000 (11:05 +0900)
Change-Id: I81528bb46496844da09c0b531ade3c208f311731


Trivial merge