Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sat, 24 Dec 2011 07:44:24 +0000 (16:44 +0900)
committerhudson <hudson@samsung.com>
Sat, 24 Dec 2011 07:44:24 +0000 (16:44 +0900)
commit7d9913f6feb28ac680094704b897b9207d7f1df3
tree262a4c5c65ea53dbb835736c214eb7a404afce48
parentc2920345269bbf8c50aeaa6b39b044ae3ac782d2
parent9f551648b633a809c2ed99e797beb6b86384f487
Merge branch 'master' into release