Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sun, 4 Dec 2011 11:55:33 +0000 (20:55 +0900)
committerhudson <hudson@samsung.com>
Sun, 4 Dec 2011 11:55:33 +0000 (20:55 +0900)
commitf79eec1b7529c14b4297a994dfbf5adc6923bb40
tree0712e38c96dcc2a26d7b5a5af7b5c4d28dda83bf
parent80be3e892f250de1040bfd9646ecab3a1c3028ee
parent42fa9945b0d51ffe8f505a327b8d2b7752717e75
Merge branch 'master' into release