Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 27 Dec 2011 12:40:27 +0000 (21:40 +0900)
committerhudson <hudson@samsung.com>
Tue, 27 Dec 2011 12:40:27 +0000 (21:40 +0900)
commitc659c23e9736c97540690974c2141ac56c2c7258
tree57788dd107ca3b43b69358fd6d8f6bc24d7e9d20
parente5adf0d923aab41f4c10230298b7a7fd84d5bde9
parent12ebc845c1a484f0cc66785bd255e5cdcc6ce190
Merge branch 'master' into release