[xmvn/f19: 4/4] Merge branch 'master' into f19

[Stanislav Ochotnicky]

commit 0fcec6650617b4ae963bce04a59fa7327b01393a
Merge: d7ccca6 7685bd4
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Fri May 24 14:49:21 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	xmvn.spec

 .gitignore                  |    1 +
 0001-Install-MOJO-fix.patch |   27 --------------
 sources                     |    2 +-
 xmvn-classworlds.conf       |    7 ----
 xmvn.spec                   |   81 +++++++++++++++++++++++++++++++++---------
 5 files changed, 65 insertions(+), 53 deletions(-)
---