Merge proposals dependent on lp:~dylanmccall/ubiquity-slideshow-ubuntu/maverick-ubuntu-design

1. maverick-ubuntu-design
2. Dependent merge proposals