Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 3 Jan 2012 02:34:26 +0000 (11:34 +0900)
committerhudson <hudson@samsung.com>
Tue, 3 Jan 2012 02:34:26 +0000 (11:34 +0900)
commit0fbfcfcf4a89ec08198ebdbb8334aa99d70a788f
treea3637e0432bb04dac94cae991c071cb56d857bfa
parent0dda5504bea5997a28a47fa7711f37b33323caff
parentbfacf302c7b9336a9dd8e0cca6b4765a24c7e745
Merge branch 'master' into release