* Merged weak-symbols branch.

* Fixed trivial merge conflict in src/system/libroot/posix/locale/nl_langinfo.cpp
* Fixed gcc 2 compilation of src/system/glue/init_term_dyn.c.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39571 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/libroot/time/PosixLCTimeInfo.h

@@ -10,11 +10,13 @@
 
 
 namespace BPrivate {
+namespace Libroot {
 
 
 extern const struct lc_time_t gPosixLCTimeInfo;
 
 
+}	// namespace Libroot
 }	// namespace BPrivate