Merge remote-tracking branch 'amdragon/eager-metadata-v4'
authorCarl Worth <cworth@cworth.org>
Mon, 25 Apr 2011 21:26:42 +0000 (14:26 -0700)
committerCarl Worth <cworth@cworth.org>
Mon, 25 Apr 2011 21:26:42 +0000 (14:26 -0700)

Trivial merge