[eclipse-birt/f17: 5/5] Merge branch 'master' into f17

[Krzysztof Daniel]

commit fc872d9697edb5d153479986e5847f6764fdb116
Merge: f41b1f1 d472914
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Oct 5 12:39:23 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	eclipse-birt.spec
    	fetch-birt.sh
    	sources

 .gitignore                                |    4 ++++
 eclipse-birt-build-with-rhino-1.7R3.patch |   10 +++++-----
 eclipse-birt.spec                         |   13 ++++++++++---
 fetch-birt.sh                             |    4 ++--
 sources                                   |    2 +-
 5 files changed, 22 insertions(+), 11 deletions(-)
---