Merge branch 'master' of git://www.sakoman.net/git/x-load-omap3
authorDavid-John Willis <John.Willis@Distant-earth.com>
Tue, 19 May 2009 09:30:18 +0000 (10:30 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Tue, 19 May 2009 09:30:18 +0000 (10:30 +0100)

Trivial merge