wrong merge
authorChunEon Park <chuneon.park@samsung.com>
Fri, 18 Nov 2011 12:59:55 +0000 (21:59 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Mon, 21 Nov 2011 00:40:25 +0000 (09:40 +0900)
commitc37623cd67cd7a6d2635aec22141084d8204ef69
tree8408855531d128ec90c510c5b2a72758cbe8562e
parent1fb7f99fdcb906961061f5a01b102c03d417de10
wrong merge

Change-Id: If3af01d20805409983776ba008211f36762c91e1
src/lib/Elementary.h.in