Merge branch 'upstream' into tmc
commiteb924030ac7dbb095342cc5fad11417471f9296e
authorLed <led@altlinux.org>
Sat, 23 Jan 2010 23:37:11 +0000 (24 01:37 +0200)
committerLed <led@altlinux.org>
Sat, 23 Jan 2010 23:37:11 +0000 (24 01:37 +0200)
treea61c36a2cf59f132f514db9f957dfd925c41c2cd
parentcfdd1ccf53700b561c813cd890ae3a88a0962808
parent951a0d80569abc24f9cacd866d81ce397ee46c52
Merge branch 'upstream' into tmc