[ruby-aws: 5/5] Merge changes from F13 branch.

[Adam Tkac]

commit 0505df429067b9096839774192a029c32b98b9ce
Merge: 588a74b 2141d69
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Aug 24 11:28:17 2010 +0200

    Merge changes from F13 branch.
    
    - merge following changes from F13 branch [Mamoru Tasaka]
      - 0.8.1
      - 0.8.0
    
    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	ruby-aws.spec
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore    |    2 +-
 ruby-aws.spec |    9 +++++++--
 sources       |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc ruby-aws.spec
index 27630d1,d480ff5..d24266e
--- a/ruby-aws.spec
+++ b/ruby-aws.spec
@@@ -79,8 -78,11 +79,13 @@@ ruby setup.rb install 
  %doc test/
  
  %changelog
 -* Sun Mar 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1
 -- 0.8.1
++* Tue Aug 24 2010 Adam Tkac <atkac redhat com> - 0.8.1-1
++- merge following changes from F13 branch [Mamoru Tasaka]
++  - 0.8.1
++  - 0.8.0
+ 
 -* Tue Mar  9 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.0-1
 -- 0.8.0
 +* Fri Jul  9 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-3
 +- make -doc subpackage also contain COPYING
  
  * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.7.0-2
  - F-12: Mass rebuild