[Upstream Migration r62382] Merge branch 'upstream' into svn_merge
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 07:10:11 +0000 (16:10 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Sun, 14 Aug 2011 07:10:54 +0000 (16:10 +0900)
commit47b2b40a87d8345d4aa8a8a12721b82434ac295c
tree3af50f2fad688adc3e8ce45f1b370e24095bd2f8
parentaa4734b7ad404b07da37f77312804ba151eddc62
parentdca0011f7be0a590bb9f84c204b6377c7b8c4f0c
[Upstream Migration r62382] Merge branch 'upstream' into svn_merge