Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 16 Dec 2011 12:41:23 +0000 (21:41 +0900)
committerhudson <hudson@samsung.com>
Fri, 16 Dec 2011 12:41:23 +0000 (21:41 +0900)
commit347e5035b7768fe0d09f02adb25756b5932a221a
tree9d333080cc3ec61db12f0075ceb5306036697df4
parent2cbaf9302fdc34e6a2441a94c92b8c76fa98c1f8
parenteeb746006d958f64ae54c01681bc44fb2632fe28
Merge branch 'master' into release