Merge branch 'HEAD', remote-tracking branch 'origin/master'
authorAdrian Schröter <adrian@suse.de>
Mon, 29 Aug 2011 12:02:28 +0000 (14:02 +0200)
committerAdrian Schröter <adrian@suse.de>
Mon, 29 Aug 2011 12:02:28 +0000 (14:02 +0200)
commit21ecbca6b3c768cc5c577899954eb05eb77b0dba
treedbe6c23bd82bec0954d6e001f99b706e574ae302
parentd3b08ff0fba7b5c05bc7436fb14c969c82335328
Merge branch 'HEAD', remote-tracking branch 'origin/master'