Merge branch 'master' of github.com:davorg/xml-feed
Dave Cross [Mon, 12 Mar 2012 19:44:19 +0000 (19:44 +0000)]

Trivial merge