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

[Peter Robinson]

commit 33d2fb6907f19fd1c68a7fcd7025af96f53e0fc2
Merge: fb83129 42e5ab7
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Mar 14 00:09:26 2012 +0000

    Merge branch 'master' into f17

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