Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 1 Dec 2011 01:03:43 +0000 (10:03 +0900)
committerhudson <hudson@samsung.com>
Thu, 1 Dec 2011 01:03:43 +0000 (10:03 +0900)
commitf91e5ec6bf62d2c3199501ffd7f38132e1a0acca
tree902f83e3f8b8bbd9eaf1c1c1054d0c73785432c5
parentb843df6363749ff7dbcee133f091056d453622ec
parent023d11ff33367dd62c389ce34a4529e21116f0ac
Merge branch 'master' into release