[icedtea-web/f17: 3/3] Merge branch 'master' into f17

[Deepak Bhole]

commit 2e9c99151c8bead687075b5ca3f79aa5ddcbf0bd
Merge: 33d2fb6 dfbc804
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Tue Apr 17 11:44:00 2012 -0400

    Merge branch 'master' into f17

 icedtea-web.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---