Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 2 Dec 2011 08:53:37 +0000 (17:53 +0900)
committerhudson <hudson@samsung.com>
Fri, 2 Dec 2011 08:53:37 +0000 (17:53 +0900)
commit2afe7555000ff8e760a6b47eb110c880e2b1e0ed
tree517dfff6d94cec1ef3fdc63fc3b7f275c6cbaef3
parentacf46843cc6eb912c5aa9cf10544da76d6217c8f
parent54b9b1ccb37a8108a88776d53c010259db3ec0d9
Merge branch 'master' into release