merge upstream
commitfac8cc50bdc7afff12e6c3ec6327ecd63d6425bb
authorJoakim Verona <joakim@verona.se>
Wed, 27 Jul 2011 09:34:40 +0000 (27 11:34 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 27 Jul 2011 09:34:40 +0000 (27 11:34 +0200)
tree0db9d4e25a2cce0d17f9c56cf6cbdfc3749d0718
parent0527c8f155cf94a1f6db9bd84b1d86501259a332
parent1ddd96f5cf0b06846edd03d6b225c31206cee0b7
merge upstream