[ws-jaxme/f17: 4/4] Merge branch 'master' into f17

[Alexander Kurtakov]

commit c3df2d28a4b0beadf02e2831be5e681d8f6eba1f
Merge: 17d2d25 9e560ee
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Apr 6 15:36:50 2012 +0300

    Merge branch 'master' into f17
    
    Conflicts:
    	ws-jaxme.spec

 ws-jaxme.spec |   36 ++++++++++++------------------------
 1 files changed, 12 insertions(+), 24 deletions(-)
---