Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 2 Dec 2011 07:38:54 +0000 (16:38 +0900)
committerhudson <hudson@samsung.com>
Fri, 2 Dec 2011 07:38:54 +0000 (16:38 +0900)
commit9994ea2192e13bdacf19f6eade6d944b238483ac
treee83477ebc2fa4f64239c821c794e39284af6420d
parent12cec2de91d0eb28060f5b697f8c83a500c665ab
parent654779d91fd9a2dcf0eb942a8475c558aa5392ef
Merge branch 'master' into release