Merge remote branch 'shadowcat/local-lib-scripts' into local-lib-scripts
Tomas Doran (t0m) [Wed, 30 Jun 2010 16:00:37 +0000 (17:00 +0100)]

Trivial merge