Merge remote-tracking branch 'remotes/origin/upstream'
authorJiyoun Park <jy0703.park@samsung.com>
Thu, 28 Jun 2012 13:45:59 +0000 (22:45 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Thu, 28 Jun 2012 13:45:59 +0000 (22:45 +0900)

Trivial merge