Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 22 Dec 2011 11:03:39 +0000 (20:03 +0900)
committerhudson <hudson@samsung.com>
Thu, 22 Dec 2011 11:03:39 +0000 (20:03 +0900)
commit866ffc010a1bb0ea2cd4cbac3ce5b471bfa17fe0
tree145921120cf413dbaf16ecedfacca79a41088f3c
parent71909b83e6337caf0633c879f1174e446e04d9ec
parent135e421cc529255fa9b7a9de2f03ed4d878c4b5f
Merge branch 'master' into release