[gyp/f12/master: 7/7] Merge remote branch 'origin/f13/master' into f12/master

[Akira TAGOH]

commit c7c3cde8ba0a7a1d6e0393837ecc5a32bd161c05
Merge: 589c3cf 858263b
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Aug 20 15:00:32 2010 +0900

    Merge remote branch 'origin/f13/master' into f12/master
    
    Conflicts:
    	.gitignore
    	gyp.spec
    	sources

 .gitignore            |    1 +
 gyp-rpmoptflags.patch |   38 ++++++++++++++++++++++++++++++++++++++
 gyp.spec              |   10 ++++++++--
 sources               |    2 +-
 4 files changed, 48 insertions(+), 3 deletions(-)
---