Merge git://repo.or.cz/opera_libre
commit5e799bcb83e14a6c2ba8bd174d6ec1e82c5ce3f6
authorEdwige Hudson <edwige.hudson@gmail.com>
Thu, 18 Dec 2008 19:56:22 +0000 (18 20:56 +0100)
committerEdwige Hudson <edwige.hudson@gmail.com>
Thu, 18 Dec 2008 19:56:22 +0000 (18 20:56 +0100)
treef08ade651de6233fdf7a429e3410850ebdb7c0c3
parent66272af774af8618f11a06903dca47594ca33edb
parent0747e618a4fa23048e8a8806fd4e1319555c4c11
Merge git://repo.or.cz/opera_libre