[deployment-guide/comm-rel: 39/727] Merge branch 'master' into ent

[Jaromir Hradilek]

commit 25ea1d3b9f4619d910202fcc7d56971969d37ac5
Merge: ff61539... e0b456a...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Fri Jul 9 15:39:58 2010 +0200

    Merge branch 'master' into ent

 en-US/Date_and_Time_Configuration.xml |    6 +++---
 en-US/Keyboard_Configuration.xml      |    6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)
---