[gyp/f13/master: 5/5] Merge remote branch 'origin/f14/master' into f13/master

[Akira TAGOH]

commit 858263bc8f6e1f4ce9816712fe525aad84652c5c
Merge: 458db28 69e6ee1
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Aug 20 14:52:33 2010 +0900

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

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