Merge commit '305b07680f' into orion/master
authorNicolas Pitre <nico@cam.org>
Mon, 16 Mar 2009 01:41:23 +0000 (21:41 -0400)
committerNicolas Pitre <nico@cam.org>
Mon, 16 Mar 2009 01:41:23 +0000 (21:41 -0400)

Trivial merge