Merge branch '5_4_snowleopard' into 5_5_snowleopard

* 5_4_snowleopard:
  memcache patch is not needed anymore
  10.6 adjustements compared to 5_4_mountainlion branch