Merge branch '4.3' of ssh://git.planet-lab.org/git/myplc into 4.3

diff --combined myplc-docs.spec
index dd71f7b,c6b835a..6d4a6d0
--- 1/myplc-docs.spec
--- 2/myplc-docs.spec
+++ b/myplc-docs.spec
@@@ -5,7 -5,7 +5,7 @@@
  
  %define name myplc-docs
  %define version 4.3
- %define taglevel 41
+ %define taglevel 42
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
@@@ -40,12 -40,6 +40,12 @@@ http://svn.planet-lab.org/wiki/MyPLCUse
  %build
  rm -rf $RPM_BUILD_ROOT
  
 +# using the new lowercase names, and handling legacy
 +[ -d PLCAPI ] || ln -s plcapi PLCAPI
 +[ -d Monitor ] || ln -s monitor Monitor
 +[ -d NodeManager ] || ln -s nodemanager NodeManager
 +[ -d MyPLC ] || ln -s myplc MyPLC
 +
  pushd PLCAPI
  # beware that making the pdf file somehow overwrites the html
  make -C doc PLCAPI.pdf 
@@@ -93,6 -87,9 +93,9 @@@ rm -rf $RPM_BUILD_ROO
  /var/www/html/planetlab/doc/
  
  %changelog
+ * Thu Jan 06 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - myplc-4.3-42
+ - handle directory name changes
+ 
  * Thu Nov 18 2010 Daniel Hokka Zakrisson <dhokka@cs.princeton.edu> - myplc-4.3-41
  - Use correct resolv.conf file.