Merge branch 'master' into ppc
authorBernhard Urban <lewurm@gmail.com>
Wed, 9 Jun 2010 21:29:49 +0000 (23:29 +0200)
committerBernhard Urban <lewurm@gmail.com>
Wed, 9 Jun 2010 21:29:49 +0000 (23:29 +0200)
commit70aa500ad5f5643fa386027158bf774a8195f604
treea0b24c798004ce127fe955b7e51e0022605f72bc
parentd31634c82c3a5328527052ee3d660f1725bbdaff
parent2f19a55f8a2893fba8b99cbbc24d50d8565c33a5
Merge branch 'master' into ppc