commit 4a0a245bb9b2da87a169e5446866c4219263e1f4 Merge: 2ca6bf5 5d98d7e Author: Dennis Gilmore <dennis at ausil.us> Date: Tue Aug 31 09:28:25 2010 -0500 Merge branch 'f13' into f12 Conflicts: gcc.spec gcc.spec | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) ---