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)
commit96cc4dd98e77b8a1f83fa850e3348219c957b7ef
treee75f46dec411859f9a82989d2b43681488122fcf
parent2b2bbca189075b6dfc9533f41dcf64a572d20550
parent406feeb749bb475bec8077a2716a5b6089bd9072
Merge branch 'master' into development
(appears to be spurious, should be the same as 406feeb749bb475bec8077a2716a5b6089bd9072)