Merge branch 'master' into derm
commit5b89c483d37e2668f336240c7092f938d985b74e
authorJean-loup Gailly <jloup@gailly.net>
Thu, 18 Mar 2010 23:45:13 +0000 (19 00:45 +0100)
committerJean-loup Gailly <jloup@gailly.net>
Thu, 18 Mar 2010 23:45:13 +0000 (19 00:45 +0100)
tree205ed7bfc134595308138f274189a1790026e287
parentdf7d8101b5fbe45aa64daca0b1ceccd58cbb0724
parentf0beb9547e971db0bc3b7fa297880d3a1179356f
Merge branch 'master' into derm