Merge 16817:16819 from trunk.
authorTom Hughes <tom@compton.nu>
Mon, 3 Aug 2009 23:59:17 +0000 (23:59 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 3 Aug 2009 23:59:17 +0000 (23:59 +0000)
commit59eebc05b2de2c85033237c06d9474d5072b4d1f
treed9b62c67df1b1898344417cd5ccccb4490a30bf8
parentcbbfdf394880d29c9a6cc2259fcfd474088fa9bb
parent60303ee06b6dbb0ae66bd6e06b833f07d65d5ff9
Merge 16817:16819 from trunk.