[npm/f18: 4/4] Merge branch 'master' into f18

[T.C. Hollingsworth]

commit 41d40405d2c0e6adfcb25f1e9bffb6ce4dbe874e
Merge: 843bc0d 7e55371
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Apr 17 15:38:36 2013 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	npm.spec

 npm.spec |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)
---