Merge branch 'restriction-lock-speed-keys'
commitd4581259747f59077d8dd09ab9ba9aad10898f0b
authorBastien Guerry <bzg@altern.org>
Sat, 31 Jul 2010 16:43:15 +0000 (31 18:43 +0200)
committerBastien Guerry <bzg@altern.org>
Sat, 31 Jul 2010 16:43:15 +0000 (31 18:43 +0200)
tree2d4230625d59746dd6444c1ff1f9715d233be375
parent0ac2a69836b78e0dda07f55dddfc338aadebfd24
parent09ae8a0b1d388fbf54588f90748ef5cfcb99b058
Merge branch 'restriction-lock-speed-keys'