merge public git changes

Origin commit data
------------------
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)

src/driver/framebuffer.h

@@ -32,6 +32,8 @@
 
 #include <string>
 #include <map>
+#include <OpenThreads/Mutex>
+#include <OpenThreads/ScopedLock>
 
 #define fb_pixel_t uint32_t
 
@@ -57,6 +59,7 @@ class CFrameBuffer
 	private:
 
 		CFrameBuffer();
+		OpenThreads::Mutex mutex;
 
 		struct rgbData
 		{