Merge from trunk.
authorBill Wohler <wohler@newt.com>
Mon, 4 Jul 2011 02:58:14 +0000 (19:58 -0700)
committerBill Wohler <wohler@newt.com>
Mon, 4 Jul 2011 02:58:14 +0000 (19:58 -0700)
commit3ca74e5368a1022e332a0601d9be2418dbe8c083
treea4bb4d280cb6758e8e2dec263e1ea261e90fa924
parent92ec073e6441e7abfdc49c7734a880fecdf2d1f3
parenta555cb879988c74b28cb0aa1e9cd1b19f5df6980
Merge from trunk.