Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Sat, 1 Nov 2014 08:22:08 +0000 (17:22 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Sat, 1 Nov 2014 08:22:08 +0000 (17:22 +0900)
Conflicts:
src/virtual_window.c

Change-Id: I7ab4aa8566bf9a80a6ce87647bcc0d27e3444efc


Trivial merge