[java-1.7.0-openjdk: 3/3] Merge remote-tracking branch 'origin/f20'

[jiri vanek]

commit edbcc84bfecc3f783813a210d77e79f21b55d900
Merge: cfb06e2 15258fc
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Thu Oct 17 13:19:10 2013 +0200

    Merge remote-tracking branch 'origin/f20'
    
    Conflicts(mysterious but fixed):
    	java-1.7.0-openjdk.spec

 .gitignore                          |    1 +
 RH661505-toBeReverted.patch         |   38 -------
 java-1.7.0-openjdk.spec             |  165 ++++++++++++++++++++----------
 sources                             |    2 +-
 zero-entry_frame_call_wrapper.patch |   34 ------
 zero-gcdrainstacktargetsize.patch   |   20 ----
 zero-s8024914.patch                 |   58 -----------
 zero-size_t.patch                   |  191 -----------------------------------
 zero-zero_build.patch               |   38 -------
 9 files changed, 114 insertions(+), 433 deletions(-)
---