[java-1.8.0-openjdk: 9/9] Merge branch 'f21'

Tue Jul 22 19:02:09 UTC 2014

commit b2143c60e8a58090de6a05034a9b09312c7b9479
Merge: 9072f47 b0f0942
Author: Omair Majid <omajid at redhat.com>
Date:   Tue Jul 22 15:01:29 2014 -0400

    Merge branch 'f21'
    
    Conflicts:
    	enableArm64.patch
    	java-1.8.0-openjdk.spec

 enableArm64.patch       |    2 +-
 java-1.8.0-openjdk.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---