Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sat, 3 Dec 2011 10:17:41 +0000 (19:17 +0900)
committerhudson <hudson@samsung.com>
Sat, 3 Dec 2011 10:17:41 +0000 (19:17 +0900)
commit47bf7e118b9d45eab7dbf445886bd2cd94c4988c
tree3523b62dbd52099f4d3693f78633e8ef4ed3ef3e
parenta70aa42249eda380ae5aba55f0a787be38673fda
parentecd5da6326dbb2d88b90b8725100c40b51e88ea3
Merge branch 'master' into release