Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sat, 3 Dec 2011 02:34:14 +0000 (11:34 +0900)
committerhudson <hudson@samsung.com>
Sat, 3 Dec 2011 02:34:14 +0000 (11:34 +0900)
commit9a2209f2ee81f123b7456e2ad739c5c910c46fcb
tree62ced2ddf976b307f3294e3ef8d7c84a0ab8a5f2
parentcafd305f5de25d95a53143d2641a7caa8278d506
parentb1a1960f7938a48c86788b269429c483f9128486
Merge branch 'master' into release