-From 8c6aa59b2380a5aa39d7e815c521407f40640545 Mon Sep 17 00:00:00 2001
+From 00fbc3fa30d78c10e13ecd04d85ecf98a39a4bb2 Mon Sep 17 00:00:00 2001
 From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-Date: Tue, 4 Feb 2014 16:06:33 +0100
+Date: Sun, 27 Jul 2014 09:07:29 +0200
 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
 
-Upstream-Status: Submitted
+Upstream-Status: Accepted
 ---
  controller_manager_tests/CMakeLists.txt | 3 ++-
  joint_limits_interface/CMakeLists.txt   | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/controller_manager_tests/CMakeLists.txt b/controller_manager_tests/CMakeLists.txt
-index 95c73cc..9e018b1 100644
+index 64731bd..badc147 100644
 --- a/controller_manager_tests/CMakeLists.txt
 +++ b/controller_manager_tests/CMakeLists.txt
 @@ -29,7 +29,7 @@ if(USE_ROSBUILD)

     target_link_libraries(joint_limits_interface_test ${catkin_LIBRARIES})
 
-- 
1.8.3.2


     add_dependencies(tests cm_test)
     target_link_libraries(cm_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
diff --git a/joint_limits_interface/CMakeLists.txt b/joint_limits_interface/CMakeLists.txt
index fedaadd..f8305f1 100644
--- a/joint_limits_interface/CMakeLists.txt
+++ b/joint_limits_interface/CMakeLists.txt
@@ -25,7 +25,6 @@ else() # catkin
