commit c839b5e332a1f78d86bbc1c85766ee37b210c3d0 Merge: b0bf900... 4504037... Author: Martin Prpic <mprpic at redhat.com> Date: Fri Jun 11 13:06:53 2010 +0200 Merge branch 'master' into ent Conflicts: en-US/Book_Info.xml en-US/Book_Info.xml | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) ---