commit 4e84277f51cf9d976aa95226602ec46901748542 Merge: 331c356 05ed7a0 Author: Orion Poplawski <orion at cora.nwra.com> Date: Thu May 19 16:05:34 2011 -0600 Merge branch 'master' into el6 xfce4-screenshooter.spec | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) ---