[hydrogen/f12/master: 10/10] Merge branch 'master' into f12

[Orcan Ogetbil]

commit f72a6c2ab2b2eeae3f35fe72a25521c960b6f265
Merge: 3fc5620 82b2646
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Oct 17 01:24:56 2010 -0400

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

 hydrogen-datadir.patch |   22 ++++++++++++++++++++++
 hydrogen.spec          |   12 +++++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---