Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 10 May 2013 10:59:00 +0000 (19:59 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Fri, 10 May 2013 10:59:07 +0000 (19:59 +0900)
Change-Id: Ib510bdaf7a6629c133a862308a580682f22fe51a


Trivial merge