[python-polybori/f16: 4/4] Merge branch 'master' into f16

[Jerry James]

commit 98ad55efe052c43b4e8951fd71aabd4e81647830
Merge: 3ac9d90 d430068
Author: Jerry James <loganjerry at gmail.com>
Date:   Tue Oct 11 10:28:31 2011 -0600

    Merge branch 'master' into f16

 python-polybori.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --cc python-polybori.spec
index b9c3284,dc55b35..132210a
--- a/python-polybori.spec
+++ b/python-polybori.spec
@@@ -208,8 -208,11 +208,10 @@@ f
  
  
  %changelog
- * Fri Oct  7 2011 Dan Horák <dan[at]danny.cz> - 0.7.2-2
- - fix build on non-x86 arches where __M4RI_HAVE_SSE2 is defined as 0
 -* Mon Oct 10 2011 Jerry James <loganjerry at gmail.com> - 0.7.2-3
++* Mon Oct 10 2011 Jerry James <loganjerry at gmail.com> - 0.7.2-2
+ - Rebuild for new m4ri
 -
 -* Fri Oct  7 2011 Dan Horák <dan[at]danny.cz> - 0.7.2-2
 -- fix build on non-x86 arches where __M4RI_HAVE_SSE2 is defined as 0
++- Fix from Dan Horák <dan[at]danny.cz>:
++  fix build on non-x86 arches where __M4RI_HAVE_SSE2 is defined as 0
  
  * Wed Sep  7 2011 Jerry James <loganjerry at gmail.com> - 0.7.2-1
  - New upstream version