[gyp/f14: 4/4] Merge remote branch 'origin/f15' into f14

[Akira TAGOH]

commit ffee7e45d1f2b7472333d120bac2ef985c7ac0b8
Merge: 69e6ee1 7a45450
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Aug 23 18:14:03 2011 +0900

    Merge remote branch 'origin/f15' into f14

 .gitignore            |    1 +
 gyp-rpmoptflags.patch |   58 ++++++++++++++++++++++---------------------------
 gyp.spec              |   12 +++++++--
 sources               |    2 +-
 4 files changed, 37 insertions(+), 36 deletions(-)
---