Merge branch 'master' into svn_merge
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Tue, 19 Jul 2011 06:52:37 +0000 (15:52 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Tue, 19 Jul 2011 06:52:37 +0000 (15:52 +0900)
commitc92b2993aaf6975884b75b446148c9d6640a4ddd
treee2843ddd6cebce37ffb693e26254f636374c374d
parent79c1a9469299be947ecdb071c76d307fe3849a5a
parent2ee0977fdb1580dae894035a13af97be24851a33
Merge branch 'master' into svn_merge