Merge branch 'charm' into gzheng/tls-fix
treec38df526fe3772c5d4d3ca42957194487d370118
-rw-r--r-- 33258 .cproject
-rw-r--r-- 590 .gitignore
-rw-r--r-- 2407 .project
drwxr-xr-x - .settings
-rw-r--r-- 37911 CHANGES
-rw-r--r-- 7925 LICENSE
-rw-r--r-- 14310 README
-rw-r--r-- 1960 README.ampi
-rw-r--r-- 9434 README.bigsim
-rw-r--r-- 1659 README.bigsim_quick
-rw-r--r-- 6186 README.cygwin
-rw-r--r-- 6558 README.win
-rwxr-xr-x 20222 build
-rw-r--r-- 911 charm.spec
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - examples
-rwxr-xr-x 857 relink.script
-rwxr-xr-x 13559 smart-build.pl
drwxr-xr-x - src
drwxr-xr-x - tests