Merge branch 'master' into development
authorNathan Bird <nathan@acceleration.net>
Tue, 2 Mar 2010 23:24:32 +0000 (18:24 -0500)
committerNathan Bird <nathan@acceleration.net>
Tue, 2 Mar 2010 23:25:03 +0000 (18:25 -0500)
(appears to be spurious, should be the same as 406feeb749bb475bec8077a2716a5b6089bd9072)


Trivial merge