Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 20:34:03 +0000 (21:34 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 10 Nov 2008 20:34:03 +0000 (21:34 +0100)
commitf621761b0cf761904e875bc0d2f84a9d38e47ddc
treef4ee5f6ad8ff0fb4b379706cdaab078b0ce3742a
parentcd279b55ba5563809c6fcb476f51ee4d0e730c97
parent5c0d43999f1e9eb0814eed3ccc0a91b030bb6a3e
Merge commit 'upstream/master'