Migration with svn revision @65865
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 6 Dec 2011 05:01:50 +0000 (14:01 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Thu, 8 Dec 2011 04:45:42 +0000 (13:45 +0900)
commit7d4e946d1fd514b23b486a6f0c1811c3655d4ed9
tree0252741a337a1b4680b1b244c4bb0989e59cb30d
parent082f821b57739e8d70bb3692ebbb21f85e1262e7
parent44c933e46aaa101c791db2104cc84372d307f063
Migration with svn revision @65865
Merge remote branch 'origin/upstream'

Conflicts:
src/lib/Makefile.am