Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 29 Nov 2011 12:54:01 +0000 (21:54 +0900)
committerhudson <hudson@samsung.com>
Tue, 29 Nov 2011 12:54:01 +0000 (21:54 +0900)
commita806e3fbfbd85f396fe5c7892ee77c238a49d744
treebdf969e7623e879f4b086ac1c84b60165f9b7b22
parent3609a3c6cdb63ff5864627d779816e717f7f4854
parent20614b1d221db5453022c3c3359a2211575ee00a
Merge branch 'master' into release