Merge with 3e40b0782da173559735be448d61e6dfecb32f2c - merging stable into testing
--HG-- branch : testing
Authored by: jwaddell 2010-04-15
Parents: [87752d][e69095]
Child: [c2db91]
jwaddell
