[hydrogen/f14/master: 4/4] Merge branch 'master' into f14

[Orcan Ogetbil]

commit cea39265fbc22157eb8357f437d0fc5a863a8568
Merge: e81474c 82b2646
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Oct 17 01:22:31 2010 -0400

    Merge branch 'master' into f14
    
    Conflicts:
    	hydrogen.spec

 hydrogen-datadir.patch |   22 ++++++++++++++++++++++
 hydrogen.spec          |   11 +++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
---