Merge branch 'master' into maint
commit61d31322c5ba04c6ca925657f7716ac3c110cb4d
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 29 Oct 2010 06:37:49 +0000 (29 08:37 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 29 Oct 2010 06:37:49 +0000 (29 08:37 +0200)
tree14bc588a9e07336eb10e118d28f678c15e315fa5
parent0dce9e70bc17e4c788311be1cede1c7315374ae9
parent2bd8a264f465823512e7d7d370544337f7772cde
Merge branch 'master' into maint