[icedtea-web/f18: 2/2] Merge branch 'f17' into f18

[Deepak Bhole]

commit 2f1e1438776260926a47d8c6af5176eab5cca02b
Merge: 2934485 6507485
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Wed Nov 7 13:24:03 2012 -0500

    Merge branch 'f17' into f18

 .gitignore       |    1 +
 icedtea-web.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---