Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 14:41:29 +0000 (15:41 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 14:41:29 +0000 (15:41 +0100)
commit812f775e0a3cd953782edcbe8a0eb727752df03f
tree28daae6a750b1573bee9c0d8dfae06cd79c5c894
parent1255acc02c7e0273e988c1cbbd1c1accc134c2bc
parent02ee6d40d403eac396cead15900b1441e3fe08d7
Merge commit 'upstream/master' into prv/po