Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 15 Dec 2011 07:23:33 +0000 (16:23 +0900)
committerhudson <hudson@samsung.com>
Thu, 15 Dec 2011 07:23:33 +0000 (16:23 +0900)
commitbbca61096a1db7fc450da41864bd803d5e54b502
treec2e81a11d05a926867dc27d1bbbd777c641cfafd
parent29bda6bd57a9dcaf55e57250012745a6a8cef79d
parent7c32c18d58b95b0b2279b7a786b1ae9b9f6159e8
Merge branch 'master' into release