Merge branch 'release-0.19' into devel
authorGui Chen <gui.chen@intel.com>
Mon, 20 May 2013 05:55:04 +0000 (01:55 -0400)
committerGui Chen <gui.chen@intel.com>
Mon, 20 May 2013 05:55:04 +0000 (01:55 -0400)

Trivial merge