[readme-live-image/f16: 2/2] Merge branch 'master' into f16

[Petr Kovář]

commit cc1142b40b9547dd68252243d0b779483889f1ba
Merge: f5826d7 6e6a389
Author: Petr Kovar <pkovar(a)redhat.com&gt;
Date:   Tue Nov 8 18:17:09 2011 +0100

    Merge branch 'master' into f16

 .gitignore                   |    3 +++
 en-US/Article_Info.xml       |    2 +-
 en-US/Fedora_Live_Images.ent |    2 +-
 en-US/Revision_History.xml   |   16 ++++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)
---