Merge some conflicts
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 4 Jul 2013 05:29:02 +0000 (14:29 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 4 Jul 2013 05:29:02 +0000 (14:29 +0900)
commitbe7e753616d486350df21027b04438bb7d9f39be
tree59be6e57e06410c6272a83ee4b7765bfb4c20c8b
parentf7a0b9649b7153727faad00d95cf660dc3ca0f26
Merge some conflicts

Change-Id: Ifbd26ccbfa77a2beba870907a626771b45b0580a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
main-loop.c
main-loop.h
vl.c