Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
authorRoland Schulz <roland@utk.edu>
Thu, 23 Feb 2012 21:49:35 +0000 (16:49 -0500)
committerRoland Schulz <roland@utk.edu>
Thu, 23 Feb 2012 21:49:35 +0000 (16:49 -0500)
commit71177370e0abae095e4f535067e6baacff096dd7
treeb75e455a495a12bffb80156db7d57f63902fb9f5
parent6f5cbe113a719c55fc52df2dd545c9a8fed327a4
parent75d7202c0eff3c829c783898d5f655d9844f6101
Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6

Conflicts:
admin/GerritBuild.bat

Change-Id: Ie04e9e5932aa2a154712a17efb03538648b4b817
admin/GerritBuild.bat
include/maths.h
src/kernel/readir.c