Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 2 Dec 2011 17:13:58 +0000 (02:13 +0900)
committerhudson <hudson@samsung.com>
Fri, 2 Dec 2011 17:13:58 +0000 (02:13 +0900)
commitcafd305f5de25d95a53143d2641a7caa8278d506
treeb813deaaaf63473e7742e32a6ddee40e865b5405
parent6f9e3cbd467de8b90d8fd27af39282205d9fc9b7
parentb67f3717b51847db11348db15852241396c4c612
Merge branch 'master' into release