Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 2 Dec 2011 07:40:19 +0000 (16:40 +0900)
committerhudson <hudson@samsung.com>
Fri, 2 Dec 2011 07:40:19 +0000 (16:40 +0900)
commit2af18c4cdab935b8addf9eec782600b3515e4775
tree75fe2a258706de1ef4c5ccc19a793e60f17be7ac
parent5328c77a3d80cbc211995f28ffa24a82924ee4d4
parent896c06002eb412395ebc851296d5ba0e01a65b24
Merge branch 'master' into release