Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sat, 7 Jan 2012 02:44:49 +0000 (11:44 +0900)
committerhudson <hudson@samsung.com>
Sat, 7 Jan 2012 02:44:49 +0000 (11:44 +0900)
commit48377e0995f5f4eca9644e5f0912d7ca3da9c5b7
tree644f707ea6c2b841f48f14be9d51883c7dffecbc
parenta2de86e1803236cdae537029c5ebc82f11f83c2f
parentbb3308972a2210c3273dc6574b423ba3a4aa01c9
Merge branch 'master' into release