[js/f15: 4/4] Merge branch 'master' into f15

[Christopher Aillon]

commit a8724bb1f73a7e6193819a1f22bd4258d60e5943
Merge: 37233c6 6643608
Author: Christopher Aillon <caillon at redhat.com>
Date:   Wed Jun 29 12:28:45 2011 -0700

    Merge branch 'master' into f15
    
    Conflicts:
    	js.spec

 .gitignore |    1 +
 js.spec    |   33 ++++++++++++++++++---------------
 sources    |    1 +
 3 files changed, 20 insertions(+), 15 deletions(-)
---