Merge branch 'release-0.25' into devel
authorGui Chen <gui.chen@intel.com>
Thu, 29 May 2014 10:21:31 +0000 (06:21 -0400)
committerGui Chen <gui.chen@intel.com>
Thu, 29 May 2014 10:21:31 +0000 (06:21 -0400)
Signed-off-by: Gui Chen <gui.chen@intel.com>
Conflicts:
debian/changelog

Change-Id: Ia1ff5d0d0ae4ced64cffd3547bee0ffd02fb3976


Trivial merge