[ompl: 2/2] Merge master

[rmattes]

commit 819517cd7d8a96c6ad45e1169152917308d13bfb
Merge: 99d4050 0f53f03
Author: Rich Mattes <richmattes at gmail.com>
Date:   Thu Aug 9 12:51:58 2012 -0400

    Merge master

 ompl.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc ompl.spec
index e8bcc33,cbe3bc3..b20a211
--- a/ompl.spec
+++ b/ompl.spec
@@@ -90,9 -80,9 +90,12 @@@ make -C build tes
  %{_datadir}/cmake/Modules/FindOMPL.cmake
  
  %changelog
 +* Thu Aug 09 2012 Rich Mattes <richmattes at gmail.com> - 0.11.1-1
 +- Update to release 0.11.1
 +
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue May 15 2012 Rich Mattes <richmattes at gmail.com> - 0.10.2-1
  - Update to release 0.10.2