Merge change 21162

* changes:
  more support for bindStatic some minor tweaks to the layout in the hopes I can start using this for gtalk soon