Merge fixes.
authorDavid-John Willis <John.Willis@Distant-earth.com>
Fri, 2 Apr 2010 10:51:49 +0000 (11:51 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Thu, 8 Apr 2010 07:19:46 +0000 (08:19 +0100)
commit7968ea692c9f98da37bd90ae6e9a12848d6aae0e
treeaa13dca1f44927e7184b45886480aa070d946fbb
parent86c4edaa3b3e3c7a60d2e35a3d59a6e9dc592488
Merge fixes.
recipes/psplash/psplash.inc