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)
Merge remote branch 'origin/upstream'

Conflicts:
src/lib/Makefile.am


Trivial merge