Merge branch 'master' into tizen_2.1
authorJunghyun Kim <jh1114.kim@samsung.com>
Tue, 23 Apr 2013 05:02:10 +0000 (14:02 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Tue, 23 Apr 2013 05:02:10 +0000 (14:02 +0900)
commitc6fd9b2d62952378b81ef58d958b778bc820fa13
tree9656665826499cd5bf03d8803e5367547398a29d
parent899e937fdf00d1da888b7c0a842672c8d8d30c5e
parent560d66afbbece36e342bf137234b2eb33aa465ea
Merge branch 'master' into tizen_2.1

Conflicts:
LICENSE.Flora