Merge branch 'origin'
authorRobert Kaiser <kairo@kairo.at>
Fri, 22 Oct 2010 13:25:51 +0000 (15:25 +0200)
committerRobert Kaiser <kairo@kairo.at>
Fri, 22 Oct 2010 13:25:51 +0000 (15:25 +0200)
commitf88289d7985a04283afff5cdaa81b0cd5449091e
treea4dc506d065565e80677c73f121e7005c3bd821f
parent4a6967897354a4e80b547c83e71bf162e342a3b4
parent4a778b7ef1e4bf6e2aaa31a83280cd3efface400
Merge branch 'origin'