Merge branch 'release-0.17' into devel
authorGui Chen <gui.chen@intel.com>
Mon, 4 Mar 2013 02:21:53 +0000 (10:21 +0800)
committerGui Chen <gui.chen@intel.com>
Mon, 4 Mar 2013 02:21:53 +0000 (10:21 +0800)
commit8dd29b0163f317c4ab02e72c4b9161b5e621b986
tree469bdb8f435189abbdf5073b7a3da4e0b04f9c90
parentaff956d93235e14daf8cfdd202204e5be7eaf9a8
parent6696329aa8d2ffd1bfa30e093884569a198e1120
Merge branch 'release-0.17' into devel