Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 8 Dec 2011 10:51:30 +0000 (19:51 +0900)
committerhudson <hudson@samsung.com>
Thu, 8 Dec 2011 10:51:30 +0000 (19:51 +0900)
commit70faeadb242cb6f5a4a9e5e6168dfbc4baf9e46f
tree202bb1b3c8991408d0af62d0af870a661886e35c
parent3164a5b2b7305275c65fa745d4e44b0d845924ae
parentf926ab752cc883053eb7194451fccd8e991ab00e
Merge branch 'master' into release