Dia

Merge proposals dependent on lp://staging/~noxxious/dia/dia_0_97_ubuntu

lp://staging/~noxxious/dia/dia_0_97_ubuntu has no merge proposals.