tree e131ace80055f46828a307ed49ca5b51b69faf3b
parent af74eab90fbe9c74c51085a8cccf74cd318ab7ee
parent e54ca221ea41951970e0249fb5163642c915dbb2
author Roger Peppe <roger.peppe@canonical.com> 1392740340 +0000
committer Roger Peppe <roger.peppe@canonical.com> 1392740340 +0000

merge trunk;