<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>ecd142faa607bba7837652f05d0221d0da9cc321</id>
    </parent>
    <parent>
      <id>8cd5c3f1ff513aec44699bd6c239924f453a141a</id>
    </parent>
  </parents>
  <author>
    <name>Mathias Meyer</name>
    <email>meyer@paperplanes.de</email>
  </author>
  <url>http://github.com/ezmobius/nanite/commit/0719f408ca9fdbfe26317700bdc00028fbbbc9de</url>
  <id>0719f408ca9fdbfe26317700bdc00028fbbbc9de</id>
  <committed-date>2009-06-26T12:18:58-07:00</committed-date>
  <authored-date>2009-06-26T12:18:58-07:00</authored-date>
  <message>Merge commit 'ezmobius/master' into merge_ezmobius

Conflicts:
	lib/nanite/cluster.rb
	lib/nanite/job.rb
	lib/nanite/mapper.rb</message>
  <tree>cfdca51db3664cb2dcabcf088e2aa2c45bf032a4</tree>
  <committer>
    <name>Mathias Meyer</name>
    <email>meyer@paperplanes.de</email>
  </committer>
</commit>
