commit 45c8c3500bbc139d55c10af1e2b736bdf5535a88 Merge: 1747327 54a9d2e Author: Adam Stokes <astokes at fedoraproject.org> Date: Fri Oct 21 12:51:38 2011 -0400 Merge branch 'master' into f15 mingw32-matahari.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---