Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 6 Jan 2012 09:54:22 +0000 (18:54 +0900)
committerhudson <hudson@samsung.com>
Fri, 6 Jan 2012 09:54:22 +0000 (18:54 +0900)
commit1d23136cbf1bd09f4d999b1b9f37189f397156d0
treed76b8fe36f4d88478f2aa95996eb2d467becf45e
parent41eb549aabc0e94d3ab3f6f14c440973fb902f41
parent7c0ae0de4bfce46ab4f29f48f1f1fa27c91b581f
Merge branch 'master' into release