diff -r 9ff8625cadec -r 542727448cc4 doc/contributions.txt
--- a/doc/contributions.txt	Wed Sep 01 14:41:51 2010 -0700
+++ b/doc/contributions.txt	Fri Apr 08 13:06:52 2011 +0200
@@ -153,6 +153,7 @@
 blino Nakamura
 	VWR-17
 Boroondas Gupte
+	OPEN-54
 	SNOW-278
 	SNOW-503
 	SNOW-510
diff -r 9ff8625cadec -r 542727448cc4 indra/cmake/JsonCpp.cmake
--- a/indra/cmake/JsonCpp.cmake	Wed Sep 01 14:41:51 2010 -0700
+++ b/indra/cmake/JsonCpp.cmake	Fri Apr 08 13:06:52 2011 +0200
@@ -18,5 +18,5 @@
   elseif (LINUX)
     set(JSONCPP_LIBRARIES jsoncpp)
   endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp)
+  set(JSONCPP_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/jsoncpp)
 endif (STANDALONE)
diff -r 9ff8625cadec -r 542727448cc4 indra/newview/CMakeLists.txt
--- a/indra/newview/CMakeLists.txt	Wed Sep 01 14:41:51 2010 -0700
+++ b/indra/newview/CMakeLists.txt	Fri Apr 08 13:06:52 2011 +0200
@@ -45,7 +45,7 @@
 include_directories(
     ${DBUSGLIB_INCLUDE_DIRS}
     ${ELFIO_INCLUDE_DIR}
-    ${JSONCPP_INCLUDE_DIRS}
+    ${JSONCPP_INCLUDE_DIR}
     ${LLAUDIO_INCLUDE_DIRS}
     ${LLCHARACTER_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}