Merge remote branch 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:09:37 +0000 (11:09 +0200)
committerintrigeri <intrigeri@boum.org>
Sun, 22 Aug 2010 09:09:37 +0000 (11:09 +0200)

Trivial merge