Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 8 Dec 2011 12:12:10 +0000 (21:12 +0900)
committerhudson <hudson@samsung.com>
Thu, 8 Dec 2011 12:12:10 +0000 (21:12 +0900)
commita8572120dc5d3262298d5172c63b107ef1303040
treee5a5e51b87850f5a09c49bd189cf09d7bde0c018
parent2f7137fb2aa85bdb45e29b1f732511c15589cd14
parentd9b28b41d52142550b179e98bb68c697dcf9175d
Merge branch 'master' into release