r1621: Merging r1620 from trunk

Author Robert Sesek <rsesek@bluestatic.org>
Author date 2008-04-22 19:34:12
Author local date 2008-04-22 19:34:12 +0000
Committer Robert Sesek <rsesek@bluestatic.org>
Committer date 2008-04-22 19:34:12
Committer local date 2008-04-22 19:34:12 +0000
Commit db18f796b613653d44c5c1d572376d8eb86afa44
Tree 8023e56a03a555960e75251f3c80cf84db1e2bf0
Parent b5e652e66affb28a01cbcce381f7326b43d41e43
r1621: Merging r1620 from trunk