merging master into kohana_3

--===============5370689335838482633==
Content-Type: multipart/alternative; boundary=14dae94edf11246a1f04de5c8533

--14dae94edf11246a1f04de5c8533
Content-Type: text/plain; charset=ISO-8859-1

Shad, can you take a shot at merging master into kohana_3?  I just pushed a
change to master that I'd like to see go into kohana_3, but I suspect that
you're more familiar with the differences between the two branches so you
can probably tell which things we need to merge and which we can ignore.

thanks,
-Bharat

--14dae94edf11246a1f04de5c8533
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div><br></div>Shad, can you take a shot at merging master=
 into kohana_3? =A0I just pushed a change to master that I&#39;d like to se=
e go into kohana_3, but I suspect that you&#39;re more familiar with the di=
fferences between the two branches so you can probably tell which things we=
 need to merge and which we can ignore.<div>

<br></div><div>thanks,</div><div>-Bharat</div></div>

--14dae94edf11246a1f04de5c8533--


--===============5370689335838482633==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
--===============5370689335838482633==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

__[ g a l l e r y - d e v e l ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]
--===============5370689335838482633==--