Elementary migration revision 70341
authorShinwoo Kim <cinoo.kim@samsung.com>
Fri, 20 Apr 2012 01:17:38 +0000 (10:17 +0900)
committerShinwoo Kim <cinoo.kim@samsung.com>
Fri, 20 Apr 2012 01:20:27 +0000 (10:20 +0900)
Merge remote branch 'remotes/origin/upstream'

Conflicts:
src/lib/elm_datetime.c
src/lib/elm_genlist.c


No differences found