[fedora-release-notes/f15/master: 7/7] Merge branch 'master' into f15

[Christopher Aillon]

commit 7847534bbfdf1a8e4848ef09ad8cfca238a1f004
Merge: df6f068 e3a39ac
Author: Christopher Aillon <caillon at redhat.com>
Date:   Sat May 7 18:31:45 2011 -0700

    Merge branch 'master' into f15
    
    Conflicts:
    	fedora-release-notes.spec

 fedora-release-notes.spec |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)
---