Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:40:24 +0000 (04:40 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:40:24 +0000 (04:40 +0100)

Trivial merge