[nodejs-node-uuid/f18: 4/4] Merge branch 'master' into f18

[Jamie Nguyen]

commit f6c26b976d64bbd54464fc0a02b74daf55dbcfd9
Merge: 3f0d8a1 de54b04
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Jul 28 15:55:02 2013 +0100

    Merge branch 'master' into f18

 nodejs-node-uuid.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---