[eclipse-changelog/f17: 2/2] Merge branch 'master' into f17

[Jeff Johnston]

commit 79142543cf1ce28052747b5b113a3cd2ff964358
Merge: af422e6 b5c64dc
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Tue Jul 3 18:06:48 2012 -0400

    Merge branch 'master' into f17

 .gitignore             |    1 +
 eclipse-changelog.spec |   20 +++++++++++++-------
 sources                |    2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
---