Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 15 Dec 2011 10:01:54 +0000 (19:01 +0900)
committerhudson <hudson@samsung.com>
Thu, 15 Dec 2011 10:01:54 +0000 (19:01 +0900)
commitfde30143517eed2f5b9f3f4f9eb4c401c3ae9be3
treed3975d264db799d229673cc2b259d0040d730f0d
parentb8355274f6505ce4c4172e82905a9798c09cfe57
parent4b2e0943d2296798538a234aaf2d4c3a4212dd39
Merge branch 'master' into release