Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 8 Dec 2011 11:22:50 +0000 (20:22 +0900)
committerhudson <hudson@samsung.com>
Thu, 8 Dec 2011 11:22:50 +0000 (20:22 +0900)
commite587b4b93653ef352dd7fb1a01a86973f1a62320
treee2b8ffd6795c157cfdcbd0917ede1d1a7b033154
parenta03bc43e8bd42a82a8ae707405d600fce1495afe
parent61a6e7b2df9f0c7d64da87b34282c11b63a497fa
Merge branch 'master' into release