[python-cryptsetup: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-cryptsetup

[Martin Sivák]

commit 4d687a97fb43f7e96143bddede600b093e4811f2
Merge: ff86aba 27f5baf
Author: Martin Sivak <msivak at redhat.com>
Date:   Thu Mar 31 16:58:05 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-cryptsetup
    
    Conflicts:
    	python-cryptsetup.spec

 python-cryptsetup.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-cryptsetup.spec
index 0fcedc7,9063ba2..9857fc9
--- a/python-cryptsetup.spec
+++ b/python-cryptsetup.spec
@@@ -49,9 -48,9 +49,12 @@@ rm -rf $RPM_BUILD_ROO
  %doc selftest.py
  
  %changelog
 +* Tue Nov 16 2010 Martin Sivak <msivak at redhat dot com> - 0.1.0-1
 +- Change in API! due to libcryptsetup rewrite
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.11-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Fri Aug 13 2010 Martin Sivak <msivak at redhat dot com> - 0.0.11-1
  - Different payload alignment
    Resolves: rhbz#623703