Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 30 Nov 2011 11:12:32 +0000 (20:12 +0900)
committerhudson <hudson@samsung.com>
Wed, 30 Nov 2011 11:12:32 +0000 (20:12 +0900)
commitdbcffc52f88e0fc108f6e9239e53f1d91e757488
tree316359bf4d4facf143dd157827a90eda7bbac543
parent98aa8e2bf6d4cb46850baddb6219e182080e3b0c
parent56f5a344489dccd912d510af2e9547b971d5786c
Merge branch 'master' into release