merge from master
authorjungmin76.park <jungmin76.park@samsung.com>
Wed, 20 Mar 2013 05:53:00 +0000 (14:53 +0900)
committerjungmin76.park <jungmin76.park@samsung.com>
Wed, 20 Mar 2013 05:53:00 +0000 (14:53 +0900)
Change-Id: I8794d39fa571228f845de77573bf0109f2d226cd
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

Trivial merge