Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 9 Jan 2012 06:45:03 +0000 (15:45 +0900)
committerhudson <hudson@samsung.com>
Mon, 9 Jan 2012 06:45:03 +0000 (15:45 +0900)
commitefe6604ca19add25ff3f20c1c194a8dbc5393d42
tree8d760c08fb98ca612354a369c5e7b43269c49cd4
parentbf443e78535b5afdab2488799d42bea7510427a9
parent1a1ef837e50b291809c8c91ce54b86dfc0b0940d
Merge branch 'master' into release