Merge branch 'master' into f14

Conflicts:
	doc/README

1 files changed, 8 insertions, 1 deletions

diff --git a/doc/README b/doc/README
index a24e14a..99db2d2 100644
--- a/doc/README
+++ b/doc/README
@@ -17,7 +17,7 @@ Quick Start:
 
     4.  install the run-time dependencies:
 
-        yum install python-imgcreate bitfrost zip unzip crcimg
+        yum install python-imgcreate bitfrost zip unzip crcimg mtd-utils
 
     5.  produce a build:
 
@@ -121,6 +121,13 @@ olpc_version_release
     in the OS image.  For example, in the OLPC OS 10.1.0 release, this
     would be 0.
 
+image_name
+
+    The naming scheme to use for the output files. The value of this field
+    must include "%d", this will be replaced with the build number. For
+    example, a value of "per%d-6" would result the output being called
+    "per703-6" for build number 703. The default value is "os%d"
+
 customization_info
 
     Please set this to a string that indicates your identity, to make