Merge branch 'gwakeup'
authorRyan Lortie <desrt@desrt.ca>
Tue, 26 Jul 2011 08:50:25 +0000 (10:50 +0200)
committerRyan Lortie <desrt@desrt.ca>
Tue, 26 Jul 2011 08:50:25 +0000 (10:50 +0200)

Trivial merge