[nodejs-inherits/el6: 4/4] Merge branch 'master' into f18

[T.C. Hollingsworth]

commit fae54b038720e001fb6109a7019a16404da116c8
Merge: 0b67a7f 0c2fbc0
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri Aug 16 14:45:35 2013 -0700

    Merge branch 'master' into f18

 nodejs-inherits.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---