Log Message: Update to 0.04 Upstream changes: 0.04 Tue May 21 11:52:10 PDT 2013 * add combine_hunks method (RJBS)