Merge proposals dependent on lp://staging/~macslow/notify-osd/gconf-style

lp://staging/~macslow/notify-osd/gconf-style has no merge proposals.