Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Mon, 26 Jan 2009 21:51:50 +0000 (22:51 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 26 Jan 2009 21:51:50 +0000 (22:51 +0100)
commitfcaa7f6237ac2b2b372cb26aed136f8a364d6ed5
tree4f5a91489e5939a1f1239aaa0e83b0037e40512b
parentcf374e97cf571c847a21efce9c26b01315a054a1
parentdfc50165dd187968fa9fd27856f3dc952ad783e9
Merge commit 'upstream/master' into prv/po