Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500

Conflicts:
	master/root/bin/colorlog

diff --combined master/root/bin/colorlog
index c261b7d73e77147ea4e2a3905c750ec65ac982c9,7e0ae004676bfc55f23700a6c92afac5dcd6d7a5..7e0ae004676bfc55f23700a6c92afac5dcd6d7a5
mode 100755,100644..100755
--- 1/master/root/bin/colorlog
--- 2/master/root/bin/colorlog
+++ b/master/root/bin/colorlog
@@@ -1,7 -1,7 +1,7 @@@
  #!/usr/bin/awk -f
- /TRACE/ {$0="\033[0;34m"$0"\033[0;0m"}
- /DEBUG/ {$0="\033[0;32m"$0"\033[0;0m"}
- /INFO/  {}
- /WARN/  {$0="\033[0;33m"$0"\033[0;0m"}
- /ERROR/ {$0="\033[0;31m"$0"\033[0;0m"}
+ /TRACE/ {$0="\033[1;34m" $0 "\033[0;0m"} # blue
+ /DEBUG/ {$0="\033[1;32m" $0 "\033[0;0m"} # green
+ /INFO/ {}
+ /WARN/ {$0="\033[1;33m" $0 "\033[0;0m"} # yellow
+ /ERROR/ {$0="\033[1;31m" $0 "\033[0;0m"} # red
  {print}