Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sun, 18 Dec 2011 06:55:03 +0000 (15:55 +0900)
committerhudson <hudson@samsung.com>
Sun, 18 Dec 2011 06:55:03 +0000 (15:55 +0900)
commit940010f2634c9c495b0afb1f88b3ba2d80ad6722
tree2c6f39c2cb6c97dde26752dbec360d16dffaf643
parentca574fbf633ec114ce1f672fc7d87604077b6ad7
parent06f8a9b4501582ae4490de21c3affde6c4f485fe
Merge branch 'master' into release