Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 29 Nov 2011 06:27:43 +0000 (15:27 +0900)
committerhudson <hudson@samsung.com>
Tue, 29 Nov 2011 06:27:43 +0000 (15:27 +0900)
commitef4ee0ef6603879ce0cfea2be73a95d04f9cb989
treea2cb0f427e49429b09f91d981198f75719bf9281
parent573788ad304ee10398c55fa6bdf9d8ccfc5a706d
parent532cf3b4d68a1b3b7edf9fa1681f726dabdb8695
Merge branch 'master' into release