Merge more fixed field extraction from trunk
authorMike Rylander <mrylander@gmail.com>
Fri, 15 Apr 2011 16:32:29 +0000 (12:32 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 15 Apr 2011 16:32:29 +0000 (12:32 -0400)

Trivial merge