Unity

Merge proposals dependent on lp://qastaging/~njpatel/unity/more-fixes-2011-09-29

  1. more-fixes-2011-09-29
  2. Dependent merge proposals

lp://qastaging/~njpatel/unity/more-fixes-2011-09-29 has no merge proposals.