[libgcroots/f13/master: 3/3] Merge remote branch 'origin/f14/master' into f13/master

[Akira TAGOH]

commit aafb69fd0f596ba191c93efae6e8434e6dcf4303
Merge: 6de6fe5 05509b3
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Dec 8 15:42:00 2010 +0900

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

 libgcroots.spec |    7 +++++--
 sources         |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---