tree 5bba999ea3f31527da02b60604531cc5fb52ea57
parent 88aab9341a315d81118be6b41c45e4fe32b94bc1
parent 6221f222c0ebf1acdf7abcf927178f40e1a65e2a
author Grant Likely <grant.likely@secretlab.ca> 1302200150 -0700
committer Grant Likely <grant.likely@secretlab.ca> 1302200150 -0700

Merge commit 'v2.6.39-rc2' into spi/merge