Merge branch 'da-function' into tizen
authorwoojin <woojin2.jung@samsung.com>
Mon, 3 Nov 2014 12:59:55 +0000 (21:59 +0900)
committerwoojin <woojin2.jung@samsung.com>
Mon, 3 Nov 2014 12:59:55 +0000 (21:59 +0900)

Trivial merge