d69cb2abe9224da7733e14d8ea42eaccca02e
parent 3e2bcad89814030ad6a369a97ad1481fd35938d3
parent 894ef820b10d77e2d6d717342fc408bdd9825139
author Rafael J. Wysocki <rjw@sisk.pl> 1250534556 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1250534556 +0200

Merge branch 'master' into for-linus
L­X?—