[java-1.8.0-openjdk: 6/6] Merge remote-tracking branch 'origin/f21'

[jiri vanek]

commit 01fa07cbb9fa8702cf46db4efb2b26eb25cb9be0
Merge: b2143c6 34d1813
Author: Jiri Vanek <jvanek at redhat.com>
Date:   Thu Aug 14 16:13:05 2014 +0200

    Merge remote-tracking branch 'origin/f21'

 java-1.8.0-openjdk.spec |  617 +++++++++++++++++++++++++++++++----------------
 java-abrt-launcher.in   |    7 -
 jconsole.desktop.in     |    6 +-
 nss.cfg                 |    3 +-
 policytool.desktop.in   |    6 +-
 5 files changed, 420 insertions(+), 219 deletions(-)
---