Merge "Migration with svn revision 66972 Merge remote branch 'origin/upstream'"
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 16 Jan 2012 09:02:09 +0000 (18:02 +0900)
committerGerrit Code Review <gerrit2@localhost>
Mon, 16 Jan 2012 09:02:09 +0000 (18:02 +0900)

Trivial merge