Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development

Former-commit-id: f16606cfba [formerly a6b4bd31146009e3d958efde759408daec52d2f4]
Former-commit-id: d02ce9d389
This commit is contained in:
Nate Jensen 2013-05-21 10:22:24 -05:00 committed by Gerrit Code Review
commit 80b1a9d18c
4 changed files with 0 additions and 2762 deletions