OSDN Git Service

Merge branch 'v1.6-branch' into fdo--master
authorXiang, Haihao <haihao.xiang@intel.com>
Thu, 10 Sep 2015 05:57:23 +0000 (13:57 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Thu, 10 Sep 2015 05:57:23 +0000 (13:57 +0800)
Conflicts:
configure.ac


Trivial merge